Certik audit revisions (#999)

* revisions: BAS-01 | Inconsistent Comment

* revisions: GEE-01 | Unsorted imports

* revisions: KEE-01 | Ambiguous Function Naming

* revisions: OPE-01 | Redundant “if” Clause
This commit is contained in:
Denali Marsh 2021-08-18 14:51:09 +02:00 committed by GitHub
parent 61b7f8f56e
commit 0714d6120e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 12 deletions

View File

@ -3,9 +3,9 @@ package swap
import ( import (
"fmt" "fmt"
"github.com/kava-labs/kava/x/swap/types"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/kava-labs/kava/x/swap/types"
) )
// InitGenesis initializes story state from genesis file // InitGenesis initializes story state from genesis file

View File

@ -79,9 +79,9 @@ func (k Keeper) Deposit(ctx sdk.Context, depositor sdk.AccAddress, coinA sdk.Coi
k.updatePool(ctx, poolID, pool) k.updatePool(ctx, poolID, pool)
if shareRecord, hasExistingShares := k.GetDepositorShares(ctx, depositor, poolID); hasExistingShares { if shareRecord, hasExistingShares := k.GetDepositorShares(ctx, depositor, poolID); hasExistingShares {
k.BeforePoolDepositModified(ctx, poolID, depositor, shareRecord.SharesOwned) k.BeforePoolDepositModified(ctx, poolID, depositor, shareRecord.SharesOwned)
k.updateShares(ctx, depositor, poolID, shareRecord.SharesOwned.Add(shares)) k.updateDepositorShares(ctx, depositor, poolID, shareRecord.SharesOwned.Add(shares))
} else { } else {
k.updateShares(ctx, depositor, poolID, shares) k.updateDepositorShares(ctx, depositor, poolID, shares)
k.AfterPoolDepositCreated(ctx, poolID, depositor, shares) k.AfterPoolDepositCreated(ctx, poolID, depositor, shares)
} }

View File

@ -240,8 +240,8 @@ func (k Keeper) updatePool(ctx sdk.Context, poolID string, pool *types.Denominat
} }
} }
// updateShares updates a depositor shares records for a pool, deleting the record if the new shares are zero // updateDepositorShares updates a depositor share records for a pool, deleting the record if the new shares are zero
func (k Keeper) updateShares(ctx sdk.Context, owner sdk.AccAddress, poolID string, shares sdk.Int) { func (k Keeper) updateDepositorShares(ctx sdk.Context, owner sdk.AccAddress, poolID string, shares sdk.Int) {
if shares.IsZero() { if shares.IsZero() {
k.DeleteDepositorShares(ctx, owner, poolID) k.DeleteDepositorShares(ctx, owner, poolID)
} else { } else {

View File

@ -53,7 +53,7 @@ func (k Keeper) Withdraw(ctx sdk.Context, owner sdk.AccAddress, shares sdk.Int,
k.updatePool(ctx, poolID, pool) k.updatePool(ctx, poolID, pool)
k.BeforePoolDepositModified(ctx, poolID, owner, shareRecord.SharesOwned) k.BeforePoolDepositModified(ctx, poolID, owner, shareRecord.SharesOwned)
k.updateShares(ctx, owner, poolID, shareRecord.SharesOwned.Sub(shares)) k.updateDepositorShares(ctx, owner, poolID, shareRecord.SharesOwned.Sub(shares))
err = k.supplyKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleAccountName, owner, withdrawnAmount) err = k.supplyKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleAccountName, owner, withdrawnAmount)
if err != nil { if err != nil {

View File

@ -200,10 +200,7 @@ func SimulateMsgWithdraw(ak types.AccountKeeper, k keeper.Keeper) simulation.Ope
// Find an account-pool pair for which withdraw is possible // Find an account-pool pair for which withdraw is possible
withdrawer, poolRecord, found := findValidAccountPoolRecordPair(accs, poolRecords, func(acc simulation.Account, poolRecord types.PoolRecord) bool { withdrawer, poolRecord, found := findValidAccountPoolRecordPair(accs, poolRecords, func(acc simulation.Account, poolRecord types.PoolRecord) bool {
_, found := k.GetDepositorShares(ctx, acc.Address, poolRecord.PoolID) _, found := k.GetDepositorShares(ctx, acc.Address, poolRecord.PoolID)
if !found { return found
return false // keep searching
}
return true
}) })
if !found { if !found {
return simulation.NewOperationMsgBasic(types.ModuleName, "no-operation (no valid pool record and withdrawer)", "", false, nil), nil, nil return simulation.NewOperationMsgBasic(types.ModuleName, "no-operation (no valid pool record and withdrawer)", "", false, nil), nil, nil

View File

@ -119,7 +119,7 @@ func (p *BasePool) AddLiquidity(desiredA sdk.Int, desiredB sdk.Int) (sdk.Int, sd
// then we use (desiredA, optimalB) as the deposit. // then we use (desiredA, optimalB) as the deposit.
// //
// If the optimalB is greater than the desiredB, we calculate the optimalA // If the optimalB is greater than the desiredB, we calculate the optimalA
// from the desiredB and use (optimalA, optimalB) as the deposit. // from the desiredB and use (optimalA, desiredB) as the deposit.
// //
// These optimal values are calculated as: // These optimal values are calculated as:
// //