fix test to be determinitic

initia-labs · Oct 3, 2024 · 8d32d97 · 8d32d97
1 parent f16b7fc
commit 8d32d97
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/x/gov/keeper/custom_grpc_query_test.go b/x/gov/keeper/custom_grpc_query_test.go
@@ -124,7 +124,8 @@ func Test_CustomGrpcQuerier_Proposal(t *testing.T) {
 func Test_CustomGrpcQuerier_TallyResult(t *testing.T) {
 	ctx, input := createDefaultTestInput(t)
 
-	setupVesting(t, ctx, input)
+	now := time.Now().UTC()
+	setupVesting(t, ctx, input, now)
 
 	proposal, err := input.GovKeeper.SubmitProposal(ctx, nil, "", "test", "description", addrs[0], false)
 	require.NoError(t, err)
@@ -188,7 +189,7 @@ func Test_CustomGrpcQuerier_TallyResult(t *testing.T) {
 	require.NoError(t, err)
 
 	// 15 minutes passed
-	ctx = ctx.WithBlockTime(time.Now().UTC().Add(time.Minute * 15))
+	ctx = ctx.WithBlockTime(now.Add(time.Minute * 15))
 	cacheCtx, _ := ctx.CacheContext()
 
 	quorumReached, passed, burnDeposits, tallyResults, err := input.GovKeeper.Tally(cacheCtx, params, proposal)

diff --git a/x/gov/keeper/tally_test.go b/x/gov/keeper/tally_test.go
@@ -50,7 +50,7 @@ func Test_isLowThresholdProposal(t *testing.T) {
 	require.False(t, keeper.IsLowThresholdProposal(params, proposal))
 }
 
-func setupVesting(t *testing.T, ctx sdk.Context, input TestKeepers) {
+func setupVesting(t *testing.T, ctx sdk.Context, input TestKeepers, now time.Time) {
 	err := input.MoveKeeper.PublishModuleBundle(ctx, vmtypes.TestAddress, vmtypes.NewModuleBundle(vmtypes.NewModule(vestingModule)), movetypes.UpgradePolicy_COMPATIBLE)
 	require.NoError(t, err)
 
@@ -68,7 +68,6 @@ func setupVesting(t *testing.T, ctx sdk.Context, input TestKeepers) {
 	err = input.MoveKeeper.ExecuteEntryFunctionJSON(ctx, creatorAddr, moduleAddr, moduleName, "create_vesting_store", []vmtypes.TypeTag{}, []string{fmt.Sprintf("\"%s\"", metadata)})
 	require.NoError(t, err)
 
-	now := time.Now().UTC()
 	ctx = ctx.WithBlockTime(now)
 
 	// add vesting
@@ -104,7 +103,8 @@ func setupVesting(t *testing.T, ctx sdk.Context, input TestKeepers) {
 func Test_Tally(t *testing.T) {
 	ctx, input := createDefaultTestInput(t)
 
-	setupVesting(t, ctx, input)
+	now := time.Now().UTC()
+	setupVesting(t, ctx, input, now)
 
 	proposal, err := input.GovKeeper.SubmitProposal(ctx, nil, "", "test", "description", addrs[0], false)
 	require.NoError(t, err)
@@ -168,7 +168,7 @@ func Test_Tally(t *testing.T) {
 	require.NoError(t, err)
 
 	// 15 minutes passed
-	ctx = ctx.WithBlockTime(time.Now().UTC().Add(time.Minute * 15))
+	ctx = ctx.WithBlockTime(now.Add(time.Minute * 15))
 
 	quorumReached, passed, burnDeposits, tallyResults, err := input.GovKeeper.Tally(ctx, params, proposal)
 	require.NoError(t, err)