Fix after self-review.

multiversx · Nov 12, 2024 · 5f8d03f · 5f8d03f
1 parent 22026c6
commit 5f8d03f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 20 deletions.
diff --git a/dataRetriever/interface.go b/dataRetriever/interface.go
@@ -9,7 +9,6 @@ import (
 	"github.com/multiversx/mx-chain-go/p2p"
 	"github.com/multiversx/mx-chain-go/state"
 	"github.com/multiversx/mx-chain-go/storage"
-	vmcommon "github.com/multiversx/mx-chain-vm-common-go"
 )
 
 // ResolverThrottler can monitor the number of the currently running resolver go routines
@@ -360,12 +359,6 @@ type PeerAuthenticationPayloadValidator interface {
 	IsInterfaceNil() bool
 }
 
-// EpochNotifier can notify upon an epoch change
-type EpochNotifier interface {
-	RegisterNotifyHandler(handler vmcommon.EpochSubscriberHandler)
-	IsInterfaceNil() bool
-}
-
 // AccountNonceProvider defines the behavior of a component able to provide the nonce for an account
 type AccountNonceProvider interface {
 	GetAccountNonce(accountKey []byte) (uint64, error)

diff --git a/factory/processing/blockProcessorCreator.go b/factory/processing/blockProcessorCreator.go
@@ -260,9 +260,8 @@ func (pcf *processComponentsFactory) newShardBlockProcessor(
 		BadTxForwarder:      badTxInterim,
 		EnableRoundsHandler: pcf.coreData.EnableRoundsHandler(),
 		EnableEpochsHandler: pcf.coreData.EnableEpochsHandler(),
-		// TODO: is this correct?
-		VMOutputCacher:     txcache.NewDisabledCache(),
-		WasmVMChangeLocker: wasmVMChangeLocker,
+		VMOutputCacher:      txcache.NewDisabledCache(),
+		WasmVMChangeLocker:  wasmVMChangeLocker,
 	}
 
 	scProcessorProxy, err := processProxy.NewSmartContractProcessorProxy(argsNewScProcessor, pcf.epochNotifier)
@@ -590,9 +589,8 @@ func (pcf *processComponentsFactory) newMetaBlockProcessor(
 		BadTxForwarder:      badTxForwarder,
 		EnableRoundsHandler: pcf.coreData.EnableRoundsHandler(),
 		EnableEpochsHandler: pcf.coreData.EnableEpochsHandler(),
-		// TODO: is this correct?
-		VMOutputCacher:     txcache.NewDisabledCache(),
-		WasmVMChangeLocker: wasmVMChangeLocker,
+		VMOutputCacher:      txcache.NewDisabledCache(),
+		WasmVMChangeLocker:  wasmVMChangeLocker,
 	}
 
 	scProcessorProxy, err := processProxy.NewSmartContractProcessorProxy(argsNewScProcessor, pcf.epochNotifier)

diff --git a/genesis/process/metaGenesisBlockCreator.go b/genesis/process/metaGenesisBlockCreator.go
@@ -458,8 +458,7 @@ func createProcessorsForMetaGenesisBlock(arg ArgsGenesisBlockCreator, enableEpoc
 		EnableEpochsHandler: enableEpochsHandler,
 		IsGenesisProcessing: true,
 		WasmVMChangeLocker:  &sync.RWMutex{}, // local Locker as to not interfere with the rest of the components
-		// TODO: is this correct?
-		VMOutputCacher: txcache.NewDisabledCache(),
+		VMOutputCacher:      txcache.NewDisabledCache(),
 	}
 
 	scProcessorProxy, err := processProxy.NewSmartContractProcessorProxy(argsNewSCProcessor, epochNotifier)

diff --git a/genesis/process/shardGenesisBlockCreator.go b/genesis/process/shardGenesisBlockCreator.go
@@ -526,9 +526,8 @@ func createProcessorsForShardGenesisBlock(arg ArgsGenesisBlockCreator, enableEpo
 		EnableRoundsHandler: enableRoundsHandler,
 		EnableEpochsHandler: enableEpochsHandler,
 		IsGenesisProcessing: true,
-		// TODO: is this correct?
-		VMOutputCacher:     txcache.NewDisabledCache(),
-		WasmVMChangeLocker: genesisWasmVMLocker,
+		VMOutputCacher:      txcache.NewDisabledCache(),
+		WasmVMChangeLocker:  genesisWasmVMLocker,
 	}
 
 	scProcessorProxy, err := processProxy.NewSmartContractProcessorProxy(argsNewScProcessor, epochNotifier)

diff --git a/integrationTests/vm/wasm/utils.go b/integrationTests/vm/wasm/utils.go
@@ -396,8 +396,7 @@ func (context *TestContext) initTxProcessorWithOneSCExecutorWithVMs() {
 		EnableRoundsHandler: context.EnableRoundsHandler,
 		EnableEpochsHandler: context.EnableEpochsHandler,
 		WasmVMChangeLocker:  context.WasmVMChangeLocker,
-		// TODO: is this correct?
-		VMOutputCacher: txcache.NewDisabledCache(),
+		VMOutputCacher:      txcache.NewDisabledCache(),
 	}
 
 	context.ScProcessor, err = processProxy.NewTestSmartContractProcessorProxy(argsNewSCProcessor, context.EpochNotifier)