Inline verifier struct creation (#3252)

ava-labs · Jul 31, 2024 · e327ddb · e327ddb
1 parent c26cbaf
commit e327ddb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 41 deletions.
diff --git a/vms/platformvm/block/executor/block.go b/vms/platformvm/block/executor/block.go
@@ -29,7 +29,10 @@ func (b *Block) Verify(context.Context) error {
 		return nil
 	}
 
-	return b.Visit(b.manager.verifier)
+	return b.Visit(&verifier{
+		backend:           b.manager.backend,
+		txExecutorBackend: b.manager.txExecutorBackend,
+	})
 }
 
 func (b *Block) Accept(context.Context) error {

diff --git a/vms/platformvm/block/executor/manager.go b/vms/platformvm/block/executor/manager.go
@@ -64,10 +64,6 @@ func NewManager(
 
 	return &manager{
 		backend: backend,
-		verifier: &verifier{
-			backend:           backend,
-			txExecutorBackend: txExecutorBackend,
-		},
 		acceptor: &acceptor{
 			backend:      backend,
 			metrics:      metrics,
@@ -85,7 +81,6 @@ func NewManager(
 
 type manager struct {
 	*backend
-	verifier block.Visitor
 	acceptor block.Visitor
 	rejector block.Visitor
 

diff --git a/vms/platformvm/block/executor/verifier_test.go b/vms/platformvm/block/executor/verifier_test.go
@@ -56,7 +56,7 @@ func TestVerifierVisitProposalBlock(t *testing.T) {
 			Log: logging.NoLog{},
 		},
 	}
-	verifier := &verifier{
+	manager := &manager{
 		txExecutorBackend: &executor.Backend{
 			Config: &config.Config{
 				UpgradeConfig: upgrade.Config{
@@ -67,10 +67,6 @@ func TestVerifierVisitProposalBlock(t *testing.T) {
 		},
 		backend: backend,
 	}
-	manager := &manager{
-		backend:  backend,
-		verifier: verifier,
-	}
 
 	blkTx := txs.NewMockUnsignedTx(ctrl)
 	blkTx.EXPECT().Visit(gomock.AssignableToTypeOf(&executor.ProposalTxExecutor{})).Return(nil).Times(1)
@@ -99,8 +95,8 @@ func TestVerifierVisitProposalBlock(t *testing.T) {
 	// Visit the block
 	blk := manager.NewBlock(apricotBlk)
 	require.NoError(blk.Verify(context.Background()))
-	require.Contains(verifier.backend.blkIDToState, apricotBlk.ID())
-	gotBlkState := verifier.backend.blkIDToState[apricotBlk.ID()]
+	require.Contains(manager.backend.blkIDToState, apricotBlk.ID())
+	gotBlkState := manager.backend.blkIDToState[apricotBlk.ID()]
 	require.Equal(apricotBlk, gotBlkState.statelessBlock)
 	require.Equal(timestamp, gotBlkState.timestamp)
 
@@ -142,7 +138,7 @@ func TestVerifierVisitAtomicBlock(t *testing.T) {
 			Log: logging.NoLog{},
 		},
 	}
-	verifier := &verifier{
+	manager := &manager{
 		txExecutorBackend: &executor.Backend{
 			Config: &config.Config{
 				UpgradeConfig: upgrade.Config{
@@ -154,10 +150,6 @@ func TestVerifierVisitAtomicBlock(t *testing.T) {
 		},
 		backend: backend,
 	}
-	manager := &manager{
-		backend:  backend,
-		verifier: verifier,
-	}
 
 	onAccept := state.NewMockDiff(ctrl)
 	blkTx := txs.NewMockUnsignedTx(ctrl)
@@ -196,8 +188,8 @@ func TestVerifierVisitAtomicBlock(t *testing.T) {
 	blk := manager.NewBlock(apricotBlk)
 	require.NoError(blk.Verify(context.Background()))
 
-	require.Contains(verifier.backend.blkIDToState, apricotBlk.ID())
-	gotBlkState := verifier.backend.blkIDToState[apricotBlk.ID()]
+	require.Contains(manager.backend.blkIDToState, apricotBlk.ID())
+	gotBlkState := manager.backend.blkIDToState[apricotBlk.ID()]
 	require.Equal(apricotBlk, gotBlkState.statelessBlock)
 	require.Equal(onAccept, gotBlkState.onAcceptState)
 	require.Equal(inputs, gotBlkState.inputs)
@@ -231,7 +223,7 @@ func TestVerifierVisitStandardBlock(t *testing.T) {
 			Log: logging.NoLog{},
 		},
 	}
-	verifier := &verifier{
+	manager := &manager{
 		txExecutorBackend: &executor.Backend{
 			Config: &config.Config{
 				UpgradeConfig: upgrade.Config{
@@ -243,10 +235,6 @@ func TestVerifierVisitStandardBlock(t *testing.T) {
 		},
 		backend: backend,
 	}
-	manager := &manager{
-		backend:  backend,
-		verifier: verifier,
-	}
 
 	blkTx := txs.NewMockUnsignedTx(ctrl)
 	atomicRequests := map[ids.ID]*atomic.Requests{
@@ -298,8 +286,8 @@ func TestVerifierVisitStandardBlock(t *testing.T) {
 	require.NoError(blk.Verify(context.Background()))
 
 	// Assert expected state.
-	require.Contains(verifier.backend.blkIDToState, apricotBlk.ID())
-	gotBlkState := verifier.backend.blkIDToState[apricotBlk.ID()]
+	require.Contains(manager.backend.blkIDToState, apricotBlk.ID())
+	gotBlkState := manager.backend.blkIDToState[apricotBlk.ID()]
 	require.Equal(apricotBlk, gotBlkState.statelessBlock)
 	require.Equal(set.Set[ids.ID]{}, gotBlkState.inputs)
 	require.Equal(timestamp, gotBlkState.timestamp)
@@ -338,7 +326,7 @@ func TestVerifierVisitCommitBlock(t *testing.T) {
 			Log: logging.NoLog{},
 		},
 	}
-	verifier := &verifier{
+	manager := &manager{
 		txExecutorBackend: &executor.Backend{
 			Config: &config.Config{
 				UpgradeConfig: upgrade.Config{
@@ -349,10 +337,6 @@ func TestVerifierVisitCommitBlock(t *testing.T) {
 		},
 		backend: backend,
 	}
-	manager := &manager{
-		backend:  backend,
-		verifier: verifier,
-	}
 
 	apricotBlk, err := block.NewApricotCommitBlock(
 		parentID,
@@ -372,8 +356,8 @@ func TestVerifierVisitCommitBlock(t *testing.T) {
 	require.NoError(blk.Verify(context.Background()))
 
 	// Assert expected state.
-	require.Contains(verifier.backend.blkIDToState, apricotBlk.ID())
-	gotBlkState := verifier.backend.blkIDToState[apricotBlk.ID()]
+	require.Contains(manager.backend.blkIDToState, apricotBlk.ID())
+	gotBlkState := manager.backend.blkIDToState[apricotBlk.ID()]
 	require.Equal(parentOnAbortState, gotBlkState.onAcceptState)
 	require.Equal(timestamp, gotBlkState.timestamp)
 
@@ -411,7 +395,7 @@ func TestVerifierVisitAbortBlock(t *testing.T) {
 			Log: logging.NoLog{},
 		},
 	}
-	verifier := &verifier{
+	manager := &manager{
 		txExecutorBackend: &executor.Backend{
 			Config: &config.Config{
 				UpgradeConfig: upgrade.Config{
@@ -422,10 +406,6 @@ func TestVerifierVisitAbortBlock(t *testing.T) {
 		},
 		backend: backend,
 	}
-	manager := &manager{
-		backend:  backend,
-		verifier: verifier,
-	}
 
 	apricotBlk, err := block.NewApricotAbortBlock(
 		parentID,
@@ -445,8 +425,8 @@ func TestVerifierVisitAbortBlock(t *testing.T) {
 	require.NoError(blk.Verify(context.Background()))
 
 	// Assert expected state.
-	require.Contains(verifier.backend.blkIDToState, apricotBlk.ID())
-	gotBlkState := verifier.backend.blkIDToState[apricotBlk.ID()]
+	require.Contains(manager.backend.blkIDToState, apricotBlk.ID())
+	gotBlkState := manager.backend.blkIDToState[apricotBlk.ID()]
 	require.Equal(parentOnAbortState, gotBlkState.onAcceptState)
 	require.Equal(timestamp, gotBlkState.timestamp)