refactor(oracle): simplify window progress query

umee-network · Aug 26, 2022 · 7380af6 · 7380af6
1 parent 4bdbf52
commit 7380af6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 19 deletions.
diff --git a/x/oracle/keeper/grpc_query.go b/x/oracle/keeper/grpc_query.go
@@ -148,16 +148,9 @@ func (q querier) SlashWindow(
 	ctx := sdk.UnwrapSDKContext(goCtx)
 	params := q.GetParams(ctx)
 
-	slashWindow := params.SlashWindow
-	votePeriod := params.VotePeriod
-	currentBlock := uint64(ctx.BlockHeight())
-	votePeriodsPerSlashWindow := slashWindow / votePeriod
-
-	currentSlashWindow := currentBlock / votePeriodsPerSlashWindow
-	blocksIntoSlashWindow := currentBlock - (currentSlashWindow * slashWindow)
-
 	return &types.QuerySlashWindowResponse{
-		WindowProgress: blocksIntoSlashWindow / votePeriod,
+		WindowProgress: (uint64(ctx.BlockHeight()) / params.VotePeriod) %
+			params.SlashWindow,
 	}, nil
 }
 

diff --git a/x/oracle/types/query.pb.gw.go b/x/oracle/types/query.pb.gw.go