chore: moving voting power update to BeginBlock (#90)

babylonchain · Oct 19, 2023 · 8f9d049 · 8f9d049
1 parent 41bc320
commit 8f9d049
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/test/e2e/btc_staking_e2e_test.go b/test/e2e/btc_staking_e2e_test.go
@@ -202,6 +202,10 @@ func (s *BTCStakingTestSuite) Test2SubmitJurySignature() {
 	activeDel := activeDels.Dels[0]
 	s.NotNil(activeDel.JurySig)
 
+	// wait for a block so that above txs take effect and the voting power table
+	// is updated in the next block's BeginBlock
+	nonValidatorNode.WaitForNextBlock()
+
 	// ensure BTC staking is activated
 	activatedHeight := nonValidatorNode.QueryActivatedHeight()
 	s.Positive(activatedHeight)

diff --git a/x/btcstaking/abci.go b/x/btcstaking/abci.go
@@ -12,10 +12,6 @@ import (
 
 func BeginBlocker(ctx sdk.Context, k keeper.Keeper, req abci.RequestBeginBlock) {
 	defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), telemetry.MetricKeyBeginBlocker)
-}
-
-func EndBlocker(ctx sdk.Context, k keeper.Keeper) []abci.ValidatorUpdate {
-	defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), telemetry.MetricKeyEndBlocker)
 
 	// index BTC height at the current height
 	k.IndexBTCHeight(ctx)
@@ -28,5 +24,10 @@ func EndBlocker(ctx sdk.Context, k keeper.Keeper) []abci.ValidatorUpdate {
 		k.RecordRewardDistCache(ctx)
 	}
 
+}
+
+func EndBlocker(ctx sdk.Context, k keeper.Keeper) []abci.ValidatorUpdate {
+	defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), telemetry.MetricKeyEndBlocker)
+
 	return []abci.ValidatorUpdate{}
 }