Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Inline verifier struct creation #3252

Merged
merged 1 commit into from
Jul 31, 2024
Merged

Inline verifier struct creation #3252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion vms/platformvm/block/executor/block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 0 additions & 5 deletions vms/platformvm/block/executor/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,6 @@ func NewManager(

return &manager{
backend: backend,
verifier: &verifier{
backend: backend,
txExecutorBackend: txExecutorBackend,
},
acceptor: &acceptor{
backend: backend,
metrics: metrics,
Expand All @@ -85,7 +81,6 @@ func NewManager(

type manager struct {
*backend
verifier block.Visitor
acceptor block.Visitor
rejector block.Visitor

Expand Down
50 changes: 15 additions & 35 deletions vms/platformvm/block/executor/verifier_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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)
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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{
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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{
Expand All @@ -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{
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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{
Expand All @@ -349,10 +337,6 @@ func TestVerifierVisitCommitBlock(t *testing.T) {
},
backend: backend,
}
manager := &manager{
backend: backend,
verifier: verifier,
}

apricotBlk, err := block.NewApricotCommitBlock(
parentID,
Expand All @@ -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)

Expand Down Expand Up @@ -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{
Expand All @@ -422,10 +406,6 @@ func TestVerifierVisitAbortBlock(t *testing.T) {
},
backend: backend,
}
manager := &manager{
backend: backend,
verifier: verifier,
}

apricotBlk, err := block.NewApricotAbortBlock(
parentID,
Expand All @@ -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)

Expand Down
Loading