minor fix

bnb-chain · Aug 18, 2020 · 2c44892 · 2c44892
1 parent a98d3ee
commit 2c44892
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/x/slashing/handler_sidechain.go b/x/slashing/handler_sidechain.go
@@ -77,13 +77,13 @@ func handleMsgBscSubmitEvidence(ctx sdk.Context, msg MsgBscSubmitEvidence, k Kee
 		}
 	}
 
-	jailUtil := header.Time.Add(k.DoubleSignUnbondDuration(sideCtx))
+	jailUntil := header.Time.Add(k.DoubleSignUnbondDuration(sideCtx))
 	sr := SlashRecord{
 		ConsAddr:         sideConsAddr.Bytes(),
 		InfractionType:   DoubleSign,
 		InfractionHeight: uint64(msg.Headers[0].Number),
 		SlashHeight:      header.Height,
-		JailUntil:        jailUtil,
+		JailUntil:        jailUntil,
 		SlashAmt:         slashedAmount.RawInt(),
 		SideChainId:      sideChainId,
 	}
@@ -94,7 +94,7 @@ func handleMsgBscSubmitEvidence(ctx sdk.Context, msg MsgBscSubmitEvidence, k Kee
 	if !found {
 		panic(fmt.Sprintf("Expected signing info for validator %s but not found", sideConsAddr.Hex()))
 	}
-	signInfo.JailedUntil = jailUtil
+	signInfo.JailedUntil = jailUntil
 	k.setValidatorSigningInfo(sideCtx, sideConsAddr.Bytes(), signInfo)
 
 	if ctx.IsDeliverTx() && k.PbsbServer != nil {
@@ -103,7 +103,7 @@ func handleMsgBscSubmitEvidence(ctx sdk.Context, msg MsgBscSubmitEvidence, k Kee
 			InfractionType:         DoubleSign,
 			InfractionHeight:       msg.Headers[0].Number,
 			SlashHeight:            header.Height,
-			JailUtil:               jailUtil,
+			JailUtil:               jailUntil,
 			SlashAmt:               slashedAmount.RawInt(),
 			SideChainId:            sideChainId,
 			ToFeePool:              toFeePool,

diff --git a/x/stake/keeper/distribute_sidechain.go b/x/stake/keeper/distribute_sidechain.go
@@ -7,8 +7,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/stake/types"
 )
 
-const threshold = 5
-
 func (k Keeper) Distribute(ctx sdk.Context, sideChainId string) {
 
 	// The rewards collected yesterday is decided by the validators the day before yesterday.

diff --git a/x/stake/keeper/reward.go b/x/stake/keeper/reward.go
@@ -1,12 +1,15 @@
 package keeper
 
 import (
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/stake/types"
 	"math"
 	"math/big"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/x/stake/types"
 )
 
+const threshold = 5
+
 func allocate(sharers []types.Sharer, totalRewards sdk.Dec, totalShares sdk.Dec) (rewards []types.Reward) {
 	var minToDistribute int64
 	var shouldCarry []types.Reward