Minor typo fixes / switching to direct sdk methods (#69)

osmosis-labs · Apr 5, 2021 · 7a6c81f · 7a6c81f
1 parent 295d3ed
commit 7a6c81f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/x/gamm/keeper/pool_service.go b/x/gamm/keeper/pool_service.go
@@ -17,7 +17,7 @@ func (k Keeper) CreatePool(
 	records []types.Record,
 ) (uint64, error) {
 	if len(records) < 2 {
-		return 0, types.ErrTooLittleRecords
+		return 0, types.ErrTooFewRecords
 	}
 	// TODO: Add the limit of binding token to the pool params?
 	if len(records) > 8 {

diff --git a/x/gamm/types/account.go b/x/gamm/types/account.go
@@ -67,19 +67,19 @@ func NewPoolAccount(poolId uint64, poolParams PoolParams) PoolAccountI {
 }
 
 func (params PoolParams) Validate() error {
-	if params.ExitFee.LT(sdk.NewDec(0)) {
+	if params.ExitFee.IsNegative() {
 		return ErrNegativeExitFee
 	}
 
-	if params.ExitFee.GTE(sdk.NewDec(1)) {
+	if params.ExitFee.GTE(sdk.OneDec()) {
 		return ErrTooMuchExitFee
 	}
 
-	if params.SwapFee.LT(sdk.NewDec(0)) {
+	if params.SwapFee.IsNegative() {
 		return ErrNegativeSwapFee
 	}
 
-	if params.SwapFee.GTE(sdk.NewDec(1)) {
+	if params.SwapFee.GTE(sdk.OneDec()) {
 		return ErrTooMuchSwapFee
 	}
 
@@ -174,7 +174,7 @@ func (pa PoolAccount) GetRecord(denom string) (Record, error) {
 		recordA := pa.Records[i]
 
 		compare := strings.Compare(recordA.Token.Denom, denom)
-		return compare == 1 || compare == 0
+		return compare >= 0
 	})
 
 	if i < 0 || i >= len(pa.Records) {

diff --git a/x/gamm/types/errors.go b/x/gamm/types/errors.go
@@ -7,7 +7,7 @@ var (
 	ErrPoolNotFound      = sdkerrors.Register(ModuleName, 1, "pool not found")
 	ErrPoolAlreadyExist  = sdkerrors.Register(ModuleName, 2, "pool already exist")
 	ErrPoolLocked        = sdkerrors.Register(ModuleName, 3, "pool is locked")
-	ErrTooLittleRecords  = sdkerrors.Register(ModuleName, 4, "pool should have at least 2 records")
+	ErrTooFewRecords     = sdkerrors.Register(ModuleName, 4, "pool should have at least 2 records, as they must be swapping between at least two assets")
 	ErrTooManyRecords    = sdkerrors.Register(ModuleName, 5, "pool has too many records")
 	ErrLimitMaxAmount    = sdkerrors.Register(ModuleName, 6, "calculated amount is larger than max amount")
 	ErrLimitMinAmount    = sdkerrors.Register(ModuleName, 7, "calculated amount is lesser than min amount")

diff --git a/x/gamm/types/msgs.go b/x/gamm/types/msgs.go
@@ -28,12 +28,9 @@ func (msg MsgCreatePool) ValidateBasic() error {
 		return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address (%s)", err)
 	}
 
-	if len(msg.Records) == 0 {
-		return ErrEmptyRecords
-	}
-
-	if len(msg.Records) == 1 {
-		return ErrTooLittleRecords
+	// The pool must be swapping between at least two assets
+	if len(msg.Records) < 2 {
+		return ErrTooFewRecords
 	}
 
 	// TODO: Add the limit of binding token to the pool params?
@@ -52,7 +49,7 @@ func (msg MsgCreatePool) ValidateBasic() error {
 	}
 
 	if msg.PoolParams.Lock {
-		return sdkerrors.Wrap(sdkerrors.ErrLogic, "can't create the locked pool")
+		return sdkerrors.Wrap(sdkerrors.ErrLogic, "can't create a locked pool")
 	}
 
 	err = msg.PoolParams.Validate()