simplify

Author: envestcc

action/protocol/execution/evm/evm.go

@@ -256,21 +256,19 @@ func ExecuteContract(
 		return nil, nil, err
 	}
 	if erigonsm, ok := sm.(interface {
-		Erigon() (erigonstate.StateWriter, *erigonstate.IntraBlockState, bool)
+		Erigon() (*erigonstate.IntraBlockState, bool)
 	}); ok {
-		if sw, in, dryrun := erigonsm.Erigon(); sw != nil && in != nil {
+		if in, dryrun := erigonsm.Erigon(); in != nil {
 			rules := ps.chainConfig.Rules(ps.context.BlockNumber, ps.genesis.IsSumatra(uint64(ps.context.BlockNumber.Int64())), ps.context.Time)
 			if dryrun {
 				stateDB = NewErigonStateDBAdapterDryrun(
 					stateDB.(*StateDBAdapter),
-					sw,
 					in,
 					NewErigonRules(&rules),
 				)
 			} else {
 				stateDB = NewErigonStateDBAdapter(
 					stateDB.(*StateDBAdapter),
-					sw,
 					in,
 					NewErigonRules(&rules),
 				)

action/protocol/execution/evm/evmstatedbadapter_erigon.go

@@ -28,7 +28,6 @@ type ErigonStateDBAdapterDryrun struct {
 }
 
 func NewErigonStateDBAdapter(adapter *StateDBAdapter,
-	rw erigonstate.StateWriter,
 	intra *erigonstate.IntraBlockState,
 	chainRules *erigonchain.Rules,
 ) *ErigonStateDBAdapter {
@@ -42,11 +41,10 @@ func NewErigonStateDBAdapter(adapter *StateDBAdapter,
 }
 
 func NewErigonStateDBAdapterDryrun(adapter *StateDBAdapter,
-	rw erigonstate.StateWriter,
 	intra *erigonstate.IntraBlockState,
 	chainRules *erigonchain.Rules,
 ) *ErigonStateDBAdapterDryrun {
-	a := NewErigonStateDBAdapter(adapter, rw, intra, chainRules)
+	a := NewErigonStateDBAdapter(adapter, intra, chainRules)
 	adapter.newContract = func(addr hash.Hash160, account *state.Account) (Contract, error) {
 		return newContractErigon(addr, account, intra)
 	}