Test error fixes

Author: Jeannette

core/blockchain.go

@@ -2502,6 +2502,7 @@ func (bc *BlockChain) SetBlockValidatorAndProcessorForTesting(v Validator, p Pro
 // It is thread-safe and can be called repeatedly without side effects.
 func (bc *BlockChain) SetTrieFlushInterval(interval time.Duration) {
 	atomic.StoreInt64(&bc.flushInterval, int64(interval))
+}
 
 // SubscribeStateChangeEvent registers a subscription StateChangeEvent.
 func (bc *BlockChain) SubscribeStateChangeEvent(ch chan<- StateChangeEvent) event.Subscription {

core/blockchain_test.go

@@ -3450,7 +3450,7 @@ func testSendingStateChangeEvents(t *testing.T, numberOfEventsToSend int) {
 		newEventCh = make(chan bool)
 	)
 
-	blockchain, _ := NewBlockChain(db, nil, gspec.Config, ethash.NewFaker(), vm.Config{}, nil, nil)
+	blockchain, _ := NewBlockChain(db, nil, gspec, nil, ethash.NewFaker(), vm.Config{}, nil, nil)
 	defer blockchain.Stop()
 
 	stateChangeCh := make(chan StateChangeEvent)

core/state/statedb.go

@@ -969,7 +969,7 @@ type StateChanges map[common.Address]ModifiedAccount
 func (s *StateDB) Commit(deleteEmptyObjects bool) (common.Hash, StateChanges, error) {
 	// Short circuit in case any database failure occurred earlier.
 	if s.dbErr != nil {
-		return common.Hash{}, fmt.Errorf("commit aborted due to earlier error: %v", s.dbErr)
+		return common.Hash{}, nil, fmt.Errorf("commit aborted due to earlier error: %v", s.dbErr)
 	}
 
 	// Finalize any pending changes and merge everything into the tries
@@ -1040,10 +1040,8 @@ func (s *StateDB) Commit(deleteEmptyObjects bool) (common.Hash, StateChanges, er
 	if metrics.EnabledExpensive {
 		start = time.Now()
 	}
-	root, set, err := s.trie.Commit(true)
-	if err != nil {
-		return common.Hash{}, StateChanges{}, err
-	}
+	root, set := s.trie.Commit(true)
+
 	// Merge the dirty nodes of account trie into global set
 	if set != nil {
 		if err := nodes.Merge(set); err != nil {

core/state/statedb_test.go

@@ -30,6 +30,7 @@ import (
 	"testing/quick"
 
 	"github.com/ethereum/go-ethereum/common"
+	//"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/core/types"
 )
@@ -113,6 +114,11 @@ func TestStateChangesEmittedFromCommit(t *testing.T) {
 }
 
 func getNewModifiedAccount() ModifiedAccount {
+	//emptyRoot is the known root hash of an empty trie.
+	//var emptyRoot = common.HexToHash("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
+	//var emptyCode = common.HexToHash("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470")
+	//var emptyCodeHash = crypto.Keccak256Hash(nil)
+
 	return ModifiedAccount{
 		Storage: make(map[common.Hash]common.Hash),
 		StateAccount: types.StateAccount{