clean up

tests/integration/keeper_test.go

@@ -223,16 +223,17 @@ func (s *IntegrationTestSuite) SetupTest() {
 	s.app = app
 }
 
-func (s *IntegrationTestSuite) mintTokens(addr sdk.AccAddress, amount sdk.Coin) {
+func (s *IntegrationTestSuite) mintTokens(addr sdk.AccAddress, amount math.Int) {
 	ctx := s.ctx
 	// s.accountKeeper.SetAccount(ctx, authtypes.NewBaseAccountWithAddress(addr))
-	s.NoError(s.bankKeeper.MintCoins(ctx, authtypes.Minter, sdk.NewCoins(amount)))
-	s.NoError(s.bankKeeper.SendCoinsFromModuleToAccount(ctx, authtypes.Minter, addr, sdk.NewCoins(amount)))
+	coins := sdk.NewCoins(sdk.NewCoin(s.denom, amount))
+	s.NoError(s.bankKeeper.MintCoins(ctx, authtypes.Minter, coins))
+	s.NoError(s.bankKeeper.SendCoinsFromModuleToAccount(ctx, authtypes.Minter, addr, coins))
 }
 
 func (s *IntegrationTestSuite) newKeysWithTokens() sdk.AccAddress {
 	Addr := sample.AccAddressBytes()
-	s.mintTokens(Addr, sdk.NewCoin(s.denom, math.NewInt(1_000_000)))
+	s.mintTokens(Addr, math.NewInt(1_000_000))
 	return Addr
 }
 
@@ -350,7 +351,7 @@ func (s *IntegrationTestSuite) CreateAccountsWithTokens(numofAccs int, amountOfT
 	accs := make([]sdk.AccAddress, numofAccs)
 	for i, pk := range privKeys {
 		accs[i] = sdk.AccAddress(pk.PubKey().Address())
-		s.mintTokens(accs[i], sdk.NewCoin(s.denom, math.NewInt(amountOfTokens)))
+		s.mintTokens(accs[i], math.NewInt(amountOfTokens))
 	}
 	return accs
 }

types/global.go

@@ -9,8 +9,9 @@ var (
 	BondDenom = "loya"
 
 	OneTrb = math.NewInt(1_000_000)
-	// ten percent of 1TRB
-	TenPercent = math.NewInt(10_000)
+	// one percent of 1TRB
+	// min stake is 1TRB so min dispute fee would be 1% of 1TRB
+	OnePercent = math.NewInt(1_000)
 
 	PowerReduction = sdk.DefaultPowerReduction
 )

x/dispute/keeper/dispute.go

@@ -307,9 +307,7 @@ func (k Keeper) AddDisputeRound(ctx sdk.Context, dispute types.Dispute, msg type
 	if err != nil {
 		return err
 	}
-	// How does second round of dispute fee work?
-	// If fee is not paid then doubling the burnAmount means reducing the fee total?
-	// Reducing the fee total means that feeTotal - burnAmount could be zero and the fee payers don't get anything from the feePaid or who gets what is not clear
+
 	return nil
 }
 

x/dispute/keeper/msg_server_propose_dispute.go

@@ -15,8 +15,8 @@ func (k msgServer) ProposeDispute(goCtx context.Context, msg *types.MsgProposeDi
 		return nil, types.ErrInvalidFeeDenom.Wrapf("wrong fee denom: %s, expected: %s", msg.Fee.Denom, layer.BondDenom)
 	}
 
-	if msg.Fee.Amount.LT(layer.TenPercent) {
-		return nil, types.ErrMinimumTRBrequired.Wrapf("fee %s dosen't meet minimum fee required", msg.Fee.Amount)
+	if msg.Fee.Amount.LT(layer.OnePercent) {
+		return nil, types.ErrMinimumTRBrequired.Wrapf("fee %s doesn't meet minimum fee required", msg.Fee.Amount)
 	}
 	dispute := k.GetDisputeByReporter(ctx, *msg.Report, msg.DisputeCategory)
 

x/reporter/keeper/distribution.go

@@ -904,9 +904,15 @@ func (k Keeper) ReturnSlashedTokens(ctx context.Context, reporterAddr string, he
 			del.Amount = source.Amount
 			del.Reporter = repAcc.String()
 			// call hooks :todo
+			if err := k.BeforeDelegationCreated(ctx, reporter); err != nil {
+				return err
+			}
 			if err := k.Delegators.Set(ctx, delAddr, del); err != nil {
 				return err
 			}
+			if err := k.AfterDelegationModified(ctx, delAddr, repAcc.Bytes(), del.Amount); err != nil {
+				return err
+			}
 			vals, err := k.GetBondedValidators(ctx, 1)
 			if err != nil {
 				return err
@@ -929,11 +935,18 @@ func (k Keeper) ReturnSlashedTokens(ctx context.Context, reporterAddr string, he
 			continue
 		}
 		// if delegator exists, add tokens to it
-		del.Amount = del.Amount.Add(source.Amount)
 		// call hooks :todo
+		if err := k.BeforeDelegationModified(ctx, delAddr, del, reporter); err != nil {
+			return err
+		}
+		del.Amount = del.Amount.Add(source.Amount)
+
 		if err := k.Delegators.Set(ctx, delAddr, del); err != nil {
 			return err
 		}
+		if err := k.AfterDelegationModified(ctx, delAddr, repAcc.Bytes(), del.Amount); err != nil {
+			return err
+		}
 		// get token origin and see if it still exists
 		prevAmt, err := k.TokenOrigin.Get(ctx, collections.Join(delAddr, valAddr))
 		if err != nil {