permissionless: removed compatibility with trusted Incaberry (#3218)

* removed class Processor Selector, and set etrog as processor
0xPolygonHermez · Feb 7, 2024 · 2ee5030 · 2ee5030
1 parent 68338dc
commit 2ee5030
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 158 deletions.
diff --git a/synchronizer/l2_sync/l2_shared/processor_trusted_batch_selector.go b/synchronizer/l2_sync/l2_shared/processor_trusted_batch_selector.go
diff --git a/synchronizer/l2_sync/l2_shared/tests/processor_trusted_batch_selector_test.go b/synchronizer/l2_sync/l2_shared/tests/processor_trusted_batch_selector_test.go
diff --git a/synchronizer/synchronizer.go b/synchronizer/synchronizer.go
@@ -20,7 +20,6 @@ import (
 	"github.com/0xPolygonHermez/zkevm-node/synchronizer/l1event_orders"
 	"github.com/0xPolygonHermez/zkevm-node/synchronizer/l2_sync/l2_shared"
 	"github.com/0xPolygonHermez/zkevm-node/synchronizer/l2_sync/l2_sync_etrog"
-	"github.com/0xPolygonHermez/zkevm-node/synchronizer/l2_sync/l2_sync_incaberry"
 	"github.com/0xPolygonHermez/zkevm-node/synchronizer/metrics"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/jackc/pgx/v4"
@@ -112,13 +111,9 @@ func NewSynchronizer(
 	}
 	L1SyncChecker := l2_sync_etrog.NewCheckSyncStatusToProcessBatch(res.zkEVMClient, res.state)
 
-	syncTrustedStateIncaberry := l2_sync_incaberry.NewSyncTrustedStateExecutor(res.zkEVMClient, res.state, res)
-	syncTrustedStateEtrog := l2_sync_etrog.NewSyncTrustedBatchExecutorForEtrog(res.zkEVMClient, res.state, res.state, res,
+	res.syncTrustedStateExecutor = l2_sync_etrog.NewSyncTrustedBatchExecutorForEtrog(res.zkEVMClient, res.state, res.state, res,
 		syncCommon.DefaultTimeProvider{}, L1SyncChecker)
 
-	res.syncTrustedStateExecutor = l2_shared.NewSyncTrustedStateExecutorSelector(
-		syncTrustedStateIncaberry, syncTrustedStateEtrog, st)
-
 	res.l1EventProcessors = defaultsL1EventProcessors(res)
 	switch cfg.L1SynchronizationMode {
 	case ParallelMode:

diff --git a/synchronizer/synchronizer_test.go b/synchronizer/synchronizer_test.go
@@ -29,6 +29,7 @@ const (
 	ETROG_MODE_FLAG                = true
 	RETRIEVE_BATCH_FROM_DB_FLAG    = true
 	RETRIEVE_BATCH_FROM_CACHE_FLAG = false
+	PROCESS_BATCH_SELECTOR_ENABLED = false
 )
 
 type mocks struct {
@@ -130,8 +131,9 @@ func TestForcedBatchEtrog(t *testing.T) {
 		FromBatchNumber: 0,
 		ToBatchNumber:   ^uint64(0),
 	}
-	m.State.EXPECT().GetForkIDInMemory(uint64(7)).Return(&forkIdInterval)
-
+	if PROCESS_BATCH_SELECTOR_ENABLED {
+		m.State.EXPECT().GetForkIDInMemory(uint64(7)).Return(&forkIdInterval)
+	}
 	m.State.
 		On("BeginStateTransaction", ctxMatchBy).
 		Run(func(args mock.Arguments) {
@@ -771,7 +773,9 @@ func expectedCallsForsyncTrustedState(t *testing.T, m *mocks, sync *ClientSynchr
 		FromBatchNumber: 0,
 		ToBatchNumber:   ^uint64(0),
 	}
-	m.State.EXPECT().GetForkIDInMemory(uint64(7)).Return(&forkIdInterval)
+	if PROCESS_BATCH_SELECTOR_ENABLED {
+		m.State.EXPECT().GetForkIDInMemory(uint64(7)).Return(&forkIdInterval)
+	}
 	batchNumber := uint64(batchInTrustedNode.Number)
 	m.ZKEVMClient.
 		On("BatchNumber", mock.Anything).