remove reader/writer builder (erigontech#2386)

* remove builder * remove builder
ArielElp · Jul 17, 2021 · 499b5ce · 499b5ce
1 parent 8d320ae
commit 499b5ce
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 21 deletions.
diff --git a/cmd/sentry/download/sentry.go b/cmd/sentry/download/sentry.go
@@ -708,7 +708,9 @@ func (ss *SentryServerImpl) SendMessageById(_ context.Context, inreq *proto_sent
 	peerID := string(gointerfaces.ConvertH512ToBytes(inreq.PeerId))
 	x, ok := ss.GoodPeers.Load(peerID)
 	if !ok {
-		return &proto_sentry.SentPeers{}, fmt.Errorf("peer not found: %s", peerID)
+		//TODO: enable after support peer to sentry mapping
+		//return &proto_sentry.SentPeers{}, fmt.Errorf("peer not found: %s", peerID)
+		return &proto_sentry.SentPeers{}, nil
 	}
 	peerInfo := x.(*PeerInfo)
 	msgcode := eth.FromProto[ss.Protocol.Version][inreq.Data.Id]

diff --git a/eth/stagedsync/stage_execute.go b/eth/stagedsync/stage_execute.go
@@ -43,10 +43,6 @@ type HasChangeSetWriter interface {
 
 type ChangeSetHook func(blockNum uint64, wr *state.ChangeSetWriter)
 
-type StateReaderBuilder func(ethdb.Database) state.StateReader
-
-type StateWriterBuilder func(db ethdb.Database, changeSetsDB ethdb.RwTx, blockNumber uint64) state.WriterWithChangeSets
-
 type ExecuteBlockCfg struct {
 	db              ethdb.RwKV
 	batchSize       datasize.ByteSize

diff --git a/eth/stagedsync/stage_tevm.go b/eth/stagedsync/stage_tevm.go
@@ -23,26 +23,20 @@ import (
 var stageTranspileGauge = metrics.NewRegisteredGauge("stage/tevm", nil)
 
 type TranspileCfg struct {
-	db            ethdb.RwKV
-	batchSize     datasize.ByteSize
-	readerBuilder StateReaderBuilder
-	writerBuilder StateWriterBuilder
-	chainConfig   *params.ChainConfig
+	db          ethdb.RwKV
+	batchSize   datasize.ByteSize
+	chainConfig *params.ChainConfig
 }
 
 func StageTranspileCfg(
 	kv ethdb.RwKV,
 	batchSize datasize.ByteSize,
-	readerBuilder StateReaderBuilder,
-	writerBuilder StateWriterBuilder,
 	chainConfig *params.ChainConfig,
 ) TranspileCfg {
 	return TranspileCfg{
-		db:            kv,
-		batchSize:     batchSize,
-		readerBuilder: readerBuilder,
-		writerBuilder: writerBuilder,
-		chainConfig:   chainConfig,
+		db:          kv,
+		batchSize:   batchSize,
+		chainConfig: chainConfig,
 	}
 }
 

diff --git a/turbo/stages/mock_sentry.go b/turbo/stages/mock_sentry.go
@@ -275,8 +275,6 @@ func MockWithEverything(t *testing.T, gspec *core.Genesis, key *ecdsa.PrivateKey
 		stagedsync.StageTranspileCfg(
 			mock.DB,
 			cfg.BatchSize,
-			nil,
-			nil,
 			mock.ChainConfig,
 		),
 		stagedsync.StageSnapshotStateCfg(

diff --git a/turbo/stages/stageloop.go b/turbo/stages/stageloop.go
@@ -300,8 +300,6 @@ func NewStagedSync2(
 		stagedsync.StageTranspileCfg(
 			db,
 			cfg.BatchSize,
-			nil,
-			nil,
 			controlServer.ChainConfig,
 		),
 		stagedsync.StageSnapshotStateCfg(db, cfg.Snapshot, tmpdir, client, snapshotMigrator),