Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/github.com/cometbft/co…
Browse files Browse the repository at this point in the history
…metbft-db-0.14.0
  • Loading branch information
gsk967 authored Aug 14, 2024
2 parents da73073 + f88a0de commit 190cdd5
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion x/incentive/keeper/scenario_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ func TestZeroBondedAtProgramEnd(t *testing.T) {
require.Equal(t, incentive.ProgramStatusOngoing, k.programStatus(1), "program 1 status ongoing (time 150)")
require.Equal(t, sdk.NewInt(6_666667), program.RemainingRewards.Amount, "one third of program rewards distributed")

// unbond half of the supply. Since Alice is is the only supplier, this should not change reward distribution
// unbond half of the supply. Since Alice is the only supplier, this should not change reward distribution
// also, alice claims rewards when unbonding
k.mustBeginUnbond(alice, coin.New(uUmee, 50_000000))

Expand Down
2 changes: 1 addition & 1 deletion x/leverage/types/keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func KeyCollateralAmountNoDenom(addr sdk.AccAddress) []byte {
return util.ConcatBytes(0, KeyPrefixCollateralAmount, address.MustLengthPrefix(addr))
}

// KeyReserveAmount returns a KVStore key for getting and setting the amount reserved of a a given token.
// KeyReserveAmount returns a KVStore key for getting and setting the amount reserved of a given token.
func KeyReserveAmount(tokenDenom string) []byte {
// reserveamountprefix | denom | 0x00 for null-termination
return util.ConcatBytes(1, KeyPrefixReserveAmount, []byte(tokenDenom))
Expand Down
2 changes: 1 addition & 1 deletion x/leverage/types/token.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func (t Token) Validate() error {
}
// The following rules ensure the utilization:APY graph is continuous
if t.KinkUtilization.GT(t.MaxSupplyUtilization) {
return fmt.Errorf("kink utilization (%s) cannot be greater than than max supply utilization (%s)",
return fmt.Errorf("kink utilization (%s) cannot be greater than max supply utilization (%s)",
t.KinkUtilization, t.MaxSupplyUtilization)
}
if t.KinkUtilization.Equal(t.MaxSupplyUtilization) && !t.MaxBorrowRate.Equal(t.KinkBorrowRate) {
Expand Down
2 changes: 1 addition & 1 deletion x/uibc/quota/quota_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func TestUnitCheckAndUpdateQuota(t *testing.T) {
assert.ErrorContains(t, err, "quota")
k.checkOutflows(umee, 8, 52)

// transferring 1 umee => 2USD, will will be still OK (8+2 <= 10)
// transferring 1 umee => 2USD, will be still OK (8+2 <= 10)
err = k.CheckAndUpdateQuota(umee, sdk.NewInt(1))
assert.NilError(t, err)
k.checkOutflows(umee, 10, 54)
Expand Down

0 comments on commit 190cdd5

Please sign in to comment.