Skip to content

N
nebula
Commit c4c7beaa authored by smartcontracts's avatar smartcontracts Committed by GitHub
Browse files
Options

fix[l2geth]: fix accidental merge conflict (#994)

parent e1d66363
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
l2geth/rollup/sync_service_test.go
View file @ c4c7beaa
...@@ -177,7 +177,6 @@ func TestTransactionToTipNoIndex(t *testing.T) { ...@@ -177,7 +177,6 @@ func TestTransactionToTipNoIndex(t *testing.T) {
l1BlockNumber, l1BlockNumber,
timestamp, timestamp,
&l1TxOrigin, &l1TxOrigin,
types.SighashEIP155,
types.QueueOriginL1ToL2, types.QueueOriginL1ToL2,
nil, // The index is `nil`, expect it to be set afterwards nil, // The index is `nil`, expect it to be set afterwards
nil, nil,
...@@ -868,7 +867,6 @@ func mockTx() *types.Transaction { ...@@ -868,7 +867,6 @@ func mockTx() *types.Transaction {
l1BlockNumber, l1BlockNumber,
timestamp, timestamp,
&l1TxOrigin, &l1TxOrigin,
types.SighashEIP155,
types.QueueOriginSequencer, types.QueueOriginSequencer,
nil, nil,
nil, nil,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment