Refactor eth.go

filecoin-project · Aug 16, 2023 · 0843d8c · 0843d8c
1 parent f48463d
commit 0843d8c
Show file tree

Hide file tree

Showing 9 changed files with 1,377 additions and 1,409 deletions.
diff --git a/node/builder_chain.go b/node/builder_chain.go
@@ -155,7 +155,6 @@ var ChainNode = Options(
 		Override(new(stmgr.StateManagerAPI), rpcstmgr.NewRPCStateManager),
 		Override(new(full.EthModuleAPI), From(new(api.Gateway))),
 		Override(new(full.EthEventAPI), From(new(api.Gateway))),
-		Override(new(full.EthTraceAPI), From(new(api.Gateway))),
 	),
 
 	// Full node API / service startup
@@ -271,12 +270,10 @@ func ConfigFullNode(c interface{}) Option {
 			If(cfg.Fevm.EnableEthRPC,
 				Override(new(full.EthModuleAPI), modules.EthModuleAPI(cfg.Fevm)),
 				Override(new(full.EthEventAPI), modules.EthEventAPI(cfg.Fevm)),
-				Override(new(full.EthTraceAPI), modules.EthTraceAPI()),
 			),
 			If(!cfg.Fevm.EnableEthRPC,
 				Override(new(full.EthModuleAPI), &full.EthModuleDummy{}),
 				Override(new(full.EthEventAPI), &full.EthModuleDummy{}),
-				Override(new(full.EthTraceAPI), &full.EthModuleDummy{}),
 			),
 		),
 

diff --git a/node/impl/full.go b/node/impl/full.go
@@ -36,7 +36,6 @@ type FullNodeAPI struct {
 	full.SyncAPI
 	full.RaftAPI
 	full.EthAPI
-	full.EthTraceAPI
 
 	DS          dtypes.MetadataDS
 	NetworkName dtypes.NetworkName

diff --git a/node/impl/full/dummy.go b/node/impl/full/dummy.go
@@ -188,4 +188,3 @@ func (e *EthModuleDummy) TraceReplayBlockTransactions(ctx context.Context, blkNu
 
 var _ EthModuleAPI = &EthModuleDummy{}
 var _ EthEventAPI = &EthModuleDummy{}
-var _ EthTraceAPI = &EthModuleDummy{}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -188,4 +188,3 @@ func (e *EthModuleDummy) TraceReplayBlockTransactions(ctx context.Context, blkNu

		var _ EthModuleAPI = &EthModuleDummy{}
		var _ EthEventAPI = &EthModuleDummy{}
		var _ EthTraceAPI = &EthModuleDummy{}