core/statedb: rename api

Signed-off-by: Ignacio Hagopian <[email protected]>

Author: jsign

core/state/statedb.go

@@ -174,7 +174,7 @@ func New(root common.Hash, db Database, snaps *snapshot.Tree) (*StateDB, error)
 		hasher:               crypto.NewKeccakState(),
 	}
 	if tr.IsVerkle() {
-		sdb.witness = sdb.NewFreshAccessWitness()
+		sdb.witness = sdb.NewAccessWitness()
 		// if sdb.snaps == nil {
 		// snapconfig := snapshot.Config{
 		// 	CacheSize:  256,
@@ -206,13 +206,13 @@ func (s *StateDB) Snaps() *snapshot.Tree {
 	return s.snaps
 }
 
-func (s *StateDB) NewFreshAccessWitness() *AccessWitness {
+func (s *StateDB) NewAccessWitness() *AccessWitness {
 	return NewAccessWitness(s.db.(*cachingDB).addrToPoint)
 }
 
 func (s *StateDB) Witness() *AccessWitness {
 	if s.witness == nil {
-		s.witness = s.NewFreshAccessWitness()
+		s.witness = s.NewAccessWitness()
 	}
 	return s.witness
 }

core/state_processor.go

@@ -320,7 +320,7 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
 func applyTransaction(msg *Message, config *params.ChainConfig, gp *GasPool, statedb *state.StateDB, blockNumber *big.Int, blockHash common.Hash, tx *types.Transaction, usedGas *uint64, evm *vm.EVM) (*types.Receipt, error) {
 	// Create a new context to be used in the EVM environment.
 	txContext := NewEVMTxContext(msg)
-	txContext.Accesses = statedb.NewFreshAccessWitness()
+	txContext.Accesses = statedb.NewAccessWitness()
 	evm.Reset(txContext, statedb)
 
 	// Apply the transaction to the current state (included in the env).

core/vm/evm.go

@@ -138,7 +138,7 @@ func NewEVM(blockCtx BlockContext, txCtx TxContext, statedb StateDB, chainConfig
 		chainRules:  chainConfig.Rules(blockCtx.BlockNumber, blockCtx.Random != nil, blockCtx.Time),
 	}
 	if txCtx.Accesses == nil && chainConfig.IsVerkle(blockCtx.BlockNumber, blockCtx.Time) {
-		txCtx.Accesses = evm.StateDB.(*state.StateDB).NewFreshAccessWitness()
+		txCtx.Accesses = evm.StateDB.(*state.StateDB).NewAccessWitness()
 	}
 	evm.interpreter = NewEVMInterpreter(evm)
 	return evm
@@ -148,7 +148,7 @@ func NewEVM(blockCtx BlockContext, txCtx TxContext, statedb StateDB, chainConfig
 // This is not threadsafe and should only be done very cautiously.
 func (evm *EVM) Reset(txCtx TxContext, statedb StateDB) {
 	if txCtx.Accesses == nil && evm.chainRules.IsVerkle {
-		txCtx.Accesses = evm.StateDB.(*state.StateDB).NewFreshAccessWitness()
+		txCtx.Accesses = evm.StateDB.(*state.StateDB).NewAccessWitness()
 	}
 	evm.TxContext = txCtx
 	evm.StateDB = statedb