diff --git a/vms/platformvm/block/builder/helpers_test.go b/vms/platformvm/block/builder/helpers_test.go index 02f7102a562c..756c58090a2e 100644 --- a/vms/platformvm/block/builder/helpers_test.go +++ b/vms/platformvm/block/builder/helpers_test.go @@ -46,12 +46,12 @@ import ( "github.com/ava-labs/avalanchego/vms/platformvm/txs/mempool" "github.com/ava-labs/avalanchego/vms/platformvm/txs/txstest" "github.com/ava-labs/avalanchego/vms/platformvm/utxo" + "github.com/ava-labs/avalanchego/vms/platformvm/validators/validatorstest" "github.com/ava-labs/avalanchego/vms/secp256k1fx" "github.com/ava-labs/avalanchego/wallet/chain/p/wallet" blockexecutor "github.com/ava-labs/avalanchego/vms/platformvm/block/executor" txexecutor "github.com/ava-labs/avalanchego/vms/platformvm/txs/executor" - pvalidators "github.com/ava-labs/avalanchego/vms/platformvm/validators" ) const ( @@ -153,7 +153,7 @@ func newEnvironment(t *testing.T, f upgradetest.Fork) *environment { //nolint:un metrics, res.state, &res.backend, - pvalidators.TestManager, + validatorstest.Manager, ) txVerifier := network.NewLockedTxVerifier(&res.ctx.Lock, res.blkManager) diff --git a/vms/platformvm/block/executor/acceptor_test.go b/vms/platformvm/block/executor/acceptor_test.go index 6f23961b7452..b3f1482c1f82 100644 --- a/vms/platformvm/block/executor/acceptor_test.go +++ b/vms/platformvm/block/executor/acceptor_test.go @@ -23,7 +23,7 @@ import ( "github.com/ava-labs/avalanchego/vms/platformvm/metrics" "github.com/ava-labs/avalanchego/vms/platformvm/state" "github.com/ava-labs/avalanchego/vms/platformvm/txs" - "github.com/ava-labs/avalanchego/vms/platformvm/validators" + "github.com/ava-labs/avalanchego/vms/platformvm/validators/validatorstest" "github.com/ava-labs/avalanchego/vms/secp256k1fx" ) @@ -62,7 +62,7 @@ func TestAcceptorVisitProposalBlock(t *testing.T) { state: s, }, metrics: metrics.Noop, - validators: validators.TestManager, + validators: validatorstest.Manager, } require.NoError(acceptor.ApricotProposalBlock(blk)) @@ -97,7 +97,7 @@ func TestAcceptorVisitAtomicBlock(t *testing.T) { }, }, metrics: metrics.Noop, - validators: validators.TestManager, + validators: validatorstest.Manager, } blk, err := block.NewApricotAtomicBlock( @@ -177,7 +177,7 @@ func TestAcceptorVisitStandardBlock(t *testing.T) { }, }, metrics: metrics.Noop, - validators: validators.TestManager, + validators: validatorstest.Manager, } blk, err := block.NewBanffStandardBlock( @@ -266,7 +266,7 @@ func TestAcceptorVisitCommitBlock(t *testing.T) { }, }, metrics: metrics.Noop, - validators: validators.TestManager, + validators: validatorstest.Manager, bootstrapped: &utils.Atomic[bool]{}, } @@ -376,7 +376,7 @@ func TestAcceptorVisitAbortBlock(t *testing.T) { }, }, metrics: metrics.Noop, - validators: validators.TestManager, + validators: validatorstest.Manager, bootstrapped: &utils.Atomic[bool]{}, } diff --git a/vms/platformvm/block/executor/helpers_test.go b/vms/platformvm/block/executor/helpers_test.go index b11e4714c885..2fa53be65b10 100644 --- a/vms/platformvm/block/executor/helpers_test.go +++ b/vms/platformvm/block/executor/helpers_test.go @@ -46,10 +46,9 @@ import ( "github.com/ava-labs/avalanchego/vms/platformvm/txs/mempool" "github.com/ava-labs/avalanchego/vms/platformvm/txs/txstest" "github.com/ava-labs/avalanchego/vms/platformvm/utxo" + "github.com/ava-labs/avalanchego/vms/platformvm/validators/validatorstest" "github.com/ava-labs/avalanchego/vms/secp256k1fx" "github.com/ava-labs/avalanchego/wallet/chain/p/wallet" - - pvalidators "github.com/ava-labs/avalanchego/vms/platformvm/validators" ) const ( @@ -166,7 +165,7 @@ func newEnvironment(t *testing.T, ctrl *gomock.Controller, f upgradetest.Fork) * metrics, res.state, res.backend, - pvalidators.TestManager, + validatorstest.Manager, ) addSubnet(t, res) } else { @@ -175,7 +174,7 @@ func newEnvironment(t *testing.T, ctrl *gomock.Controller, f upgradetest.Fork) * metrics, res.mockedState, res.backend, - pvalidators.TestManager, + validatorstest.Manager, ) // we do not add any subnet to state, since we can mock // whatever we need diff --git a/vms/platformvm/validators/test_manager.go b/vms/platformvm/validators/test_manager.go deleted file mode 100644 index e04742f265c7..000000000000 --- a/vms/platformvm/validators/test_manager.go +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (C) 2019-2024, Ava Labs, Inc. All rights reserved. -// See the file LICENSE for licensing terms. - -package validators - -import ( - "context" - - "github.com/ava-labs/avalanchego/ids" - "github.com/ava-labs/avalanchego/snow/validators" -) - -var TestManager Manager = testManager{} - -type testManager struct{} - -func (testManager) GetMinimumHeight(context.Context) (uint64, error) { - return 0, nil -} - -func (testManager) GetCurrentHeight(context.Context) (uint64, error) { - return 0, nil -} - -func (testManager) GetSubnetID(context.Context, ids.ID) (ids.ID, error) { - return ids.Empty, nil -} - -func (testManager) GetValidatorSet(context.Context, uint64, ids.ID) (map[ids.NodeID]*validators.GetValidatorOutput, error) { - return nil, nil -} - -func (testManager) OnAcceptedBlockID(ids.ID) {} diff --git a/vms/platformvm/validators/validatorstest/manager.go b/vms/platformvm/validators/validatorstest/manager.go new file mode 100644 index 000000000000..068073f4af6b --- /dev/null +++ b/vms/platformvm/validators/validatorstest/manager.go @@ -0,0 +1,35 @@ +// Copyright (C) 2019-2024, Ava Labs, Inc. All rights reserved. +// See the file LICENSE for licensing terms. + +package validatorstest + +import ( + "context" + + "github.com/ava-labs/avalanchego/ids" + + snowvalidators "github.com/ava-labs/avalanchego/snow/validators" + vmvalidators "github.com/ava-labs/avalanchego/vms/platformvm/validators" +) + +var Manager vmvalidators.Manager = manager{} + +type manager struct{} + +func (manager) GetMinimumHeight(context.Context) (uint64, error) { + return 0, nil +} + +func (manager) GetCurrentHeight(context.Context) (uint64, error) { + return 0, nil +} + +func (manager) GetSubnetID(context.Context, ids.ID) (ids.ID, error) { + return ids.Empty, nil +} + +func (manager) GetValidatorSet(context.Context, uint64, ids.ID) (map[ids.NodeID]*snowvalidators.GetValidatorOutput, error) { + return nil, nil +} + +func (manager) OnAcceptedBlockID(ids.ID) {}