fix tests

Author: 0xmountaintop

core/rawdb/accessors_skipped_txs_test.go

@@ -44,7 +44,7 @@ func newTestTransaction(queueIndex uint64) *types.Transaction {
 func TestReadWriteSkippedTransactionNoIndex(t *testing.T) {
 	tx := newTestTransaction(123)
 	db := NewMemoryDatabase()
-	writeSkippedTransaction(db, tx, "random reason", 1, &common.Hash{1})
+	writeSkippedTransaction(db, tx, nil, "random reason", 1, &common.Hash{1})
 	got := ReadSkippedTransaction(db, tx.Hash())
 	if got == nil || got.Tx.Hash() != tx.Hash() || got.Reason != "random reason" || got.BlockNumber != 1 || got.BlockHash == nil || *got.BlockHash != (common.Hash{1}) {
 		t.Fatal("Skipped transaction mismatch", "got", got)
@@ -54,7 +54,7 @@ func TestReadWriteSkippedTransactionNoIndex(t *testing.T) {
 func TestReadWriteSkippedTransaction(t *testing.T) {
 	tx := newTestTransaction(123)
 	db := NewMemoryDatabase()
-	WriteSkippedTransaction(db, tx, "random reason", 1, &common.Hash{1})
+	WriteSkippedTransaction(db, tx, nil, "random reason", 1, &common.Hash{1})
 	got := ReadSkippedTransaction(db, tx.Hash())
 	if got == nil || got.Tx.Hash() != tx.Hash() || got.Reason != "random reason" || got.BlockNumber != 1 || got.BlockHash == nil || *got.BlockHash != (common.Hash{1}) {
 		t.Fatal("Skipped transaction mismatch", "got", got)
@@ -78,7 +78,7 @@ func TestSkippedTransactionConcurrentUpdate(t *testing.T) {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			WriteSkippedTransaction(db, tx, "random reason", 1, &common.Hash{1})
+			WriteSkippedTransaction(db, tx, nil, "random reason", 1, &common.Hash{1})
 		}()
 	}
 	wg.Wait()
@@ -100,12 +100,12 @@ func TestIterateSkippedTransactions(t *testing.T) {
 	}
 
 	for _, tx := range txs {
-		WriteSkippedTransaction(db, tx, "random reason", 1, &common.Hash{1})
+		WriteSkippedTransaction(db, tx, nil, "random reason", 1, &common.Hash{1})
 	}
 
 	// simulate skipped L2 tx that's not included in the index
 	l2tx := newTestTransaction(6)
-	writeSkippedTransaction(db, l2tx, "random reason", 1, &common.Hash{1})
+	writeSkippedTransaction(db, l2tx, nil, "random reason", 1, &common.Hash{1})
 
 	it := IterateSkippedTransactionsFrom(db, 2)
 	defer it.Release()

internal/ethapi/api.go

@@ -1360,7 +1360,7 @@ func NewRPCTransaction(tx *types.Transaction, traces *types.BlockTrace, blockHas
 		R:        (*hexutil.Big)(r),
 		S:        (*hexutil.Big)(s),
 
-		Traces:   traces,
+		Traces: traces,
 	}
 	if blockHash != (common.Hash{}) {
 		result.BlockHash = &blockHash

miner/worker.go

@@ -1137,7 +1137,7 @@ loop:
 			if w.config.StoreSkippedTxTraces {
 				rawdb.WriteSkippedTransaction(w.eth.ChainDb(), tx, traces, "unknown circuit capacity checker error", w.current.header.Number.Uint64(), nil)
 			} else {
-				rawdb.WriteSkippedTransaction(w.eth.ChainDb(), tx, nil, "unknown circuit capacity checker error", w.current.header.Number.Uint64(), nil)				
+				rawdb.WriteSkippedTransaction(w.eth.ChainDb(), tx, nil, "unknown circuit capacity checker error", w.current.header.Number.Uint64(), nil)
 			}
 			l1TxCccUnknownErrCounter.Inc(1)
 
@@ -1155,7 +1155,7 @@ loop:
 			if w.config.StoreSkippedTxTraces {
 				rawdb.WriteSkippedTransaction(w.eth.ChainDb(), tx, traces, "unknown circuit capacity checker error", w.current.header.Number.Uint64(), nil)
 			} else {
-				rawdb.WriteSkippedTransaction(w.eth.ChainDb(), tx, nil, "unknown circuit capacity checker error", w.current.header.Number.Uint64(), nil)			
+				rawdb.WriteSkippedTransaction(w.eth.ChainDb(), tx, nil, "unknown circuit capacity checker error", w.current.header.Number.Uint64(), nil)
 			}
 			l2TxCccUnknownErrCounter.Inc(1)
 
@@ -1177,7 +1177,7 @@ loop:
 				if w.config.StoreSkippedTxTraces {
 					rawdb.WriteSkippedTransaction(w.eth.ChainDb(), tx, traces, fmt.Sprintf("strange error: %v", err), w.current.header.Number.Uint64(), nil)
 				} else {
-					rawdb.WriteSkippedTransaction(w.eth.ChainDb(), tx, nil, fmt.Sprintf("strange error: %v", err), w.current.header.Number.Uint64(), nil)			
+					rawdb.WriteSkippedTransaction(w.eth.ChainDb(), tx, nil, fmt.Sprintf("strange error: %v", err), w.current.header.Number.Uint64(), nil)
 				}
 				l1TxStrangeErrCounter.Inc(1)
 			}