diff --git a/vms/platformvm/block/executor/proposal_block_test.go b/vms/platformvm/block/executor/proposal_block_test.go index 96afd9e417be..df2d14c090ce 100644 --- a/vms/platformvm/block/executor/proposal_block_test.go +++ b/vms/platformvm/block/executor/proposal_block_test.go @@ -19,7 +19,6 @@ import ( "github.com/ava-labs/avalanchego/utils/constants" "github.com/ava-labs/avalanchego/utils/crypto/bls" "github.com/ava-labs/avalanchego/utils/crypto/secp256k1" - "github.com/ava-labs/avalanchego/utils/timer/mockable" "github.com/ava-labs/avalanchego/vms/components/avax" "github.com/ava-labs/avalanchego/vms/platformvm/block" "github.com/ava-labs/avalanchego/vms/platformvm/reward" @@ -139,9 +138,6 @@ func TestBanffProposalBlockTimeVerification(t *testing.T) { ctrl := gomock.NewController(t) env := newEnvironment(t, ctrl, banffFork) - env.clk.Set(defaultGenesisTime) - env.config.BanffTime = time.Time{} // activate Banff - env.config.DurangoTime = mockable.MaxTime // deactivate Durango // create parentBlock. It's a standard one for simplicity parentTime := defaultGenesisTime @@ -550,7 +546,6 @@ func TestBanffProposalBlockUpdateStakers(t *testing.T) { t.Run(test.description, func(t *testing.T) { require := require.New(t) env := newEnvironment(t, nil, banffFork) - env.config.BanffTime = time.Time{} // activate Banff subnetID := testSubnet1.ID() env.config.TrackedSubnets.Add(subnetID) @@ -703,7 +698,6 @@ func TestBanffProposalBlockUpdateStakers(t *testing.T) { func TestBanffProposalBlockRemoveSubnetValidator(t *testing.T) { require := require.New(t) env := newEnvironment(t, nil, banffFork) - env.config.BanffTime = time.Time{} // activate Banff subnetID := testSubnet1.ID() env.config.TrackedSubnets.Add(subnetID) @@ -846,7 +840,6 @@ func TestBanffProposalBlockTrackedSubnet(t *testing.T) { t.Run(fmt.Sprintf("tracked %t", tracked), func(t *testing.T) { require := require.New(t) env := newEnvironment(t, nil, banffFork) - env.config.BanffTime = time.Time{} // activate Banff subnetID := testSubnet1.ID() if tracked { @@ -951,7 +944,6 @@ func TestBanffProposalBlockTrackedSubnet(t *testing.T) { func TestBanffProposalBlockDelegatorStakerWeight(t *testing.T) { require := require.New(t) env := newEnvironment(t, nil, banffFork) - env.config.BanffTime = time.Time{} // activate Banff // Case: Timestamp is after next validator start time // Add a pending validator @@ -1136,7 +1128,6 @@ func TestBanffProposalBlockDelegatorStakerWeight(t *testing.T) { func TestBanffProposalBlockDelegatorStakers(t *testing.T) { require := require.New(t) env := newEnvironment(t, nil, banffFork) - env.config.BanffTime = time.Time{} // activate Banff // Case: Timestamp is after next validator start time // Add a pending validator @@ -1320,9 +1311,7 @@ func TestBanffProposalBlockDelegatorStakers(t *testing.T) { func TestAddValidatorProposalBlock(t *testing.T) { require := require.New(t) - env := newEnvironment(t, nil, apricotPhase5) - env.config.BanffTime = time.Time{} // activate Banff - env.config.DurangoTime = time.Time{} // activate Durango + env := newEnvironment(t, nil, durangoFork) now := env.clk.Time() diff --git a/vms/platformvm/block/executor/standard_block_test.go b/vms/platformvm/block/executor/standard_block_test.go index e7e4dc1b8ed9..85bdc41c505c 100644 --- a/vms/platformvm/block/executor/standard_block_test.go +++ b/vms/platformvm/block/executor/standard_block_test.go @@ -85,7 +85,6 @@ func TestBanffStandardBlockTimeVerification(t *testing.T) { env := newEnvironment(t, ctrl, banffFork) now := env.clk.Time() env.clk.Set(now) - env.config.BanffTime = time.Time{} // activate Banff // setup and store parent block // it's a standard block for simplicity @@ -291,7 +290,6 @@ func TestBanffStandardBlockUpdatePrimaryNetworkStakers(t *testing.T) { require := require.New(t) env := newEnvironment(t, nil, banffFork) - env.config.BanffTime = time.Time{} // activate Banff // Case: Timestamp is after next validator start time // Add a pending validator @@ -493,7 +491,6 @@ func TestBanffStandardBlockUpdateStakers(t *testing.T) { t.Run(test.description, func(t *testing.T) { require := require.New(t) env := newEnvironment(t, nil, banffFork) - env.config.BanffTime = time.Time{} // activate Banff subnetID := testSubnet1.ID() env.config.TrackedSubnets.Add(subnetID) @@ -593,7 +590,6 @@ func TestBanffStandardBlockUpdateStakers(t *testing.T) { func TestBanffStandardBlockRemoveSubnetValidator(t *testing.T) { require := require.New(t) env := newEnvironment(t, nil, banffFork) - env.config.BanffTime = time.Time{} // activate Banff subnetID := testSubnet1.ID() env.config.TrackedSubnets.Add(subnetID) @@ -691,7 +687,6 @@ func TestBanffStandardBlockTrackedSubnet(t *testing.T) { t.Run(fmt.Sprintf("tracked %t", tracked), func(t *testing.T) { require := require.New(t) env := newEnvironment(t, nil, banffFork) - env.config.BanffTime = time.Time{} // activate Banff subnetID := testSubnet1.ID() if tracked { @@ -752,7 +747,6 @@ func TestBanffStandardBlockTrackedSubnet(t *testing.T) { func TestBanffStandardBlockDelegatorStakerWeight(t *testing.T) { require := require.New(t) env := newEnvironment(t, nil, banffFork) - env.config.BanffTime = time.Time{} // activate Banff // Case: Timestamp is after next validator start time // Add a pending validator