clean up

keithsue · keithsue · commit ef8fb91bf93e · 2025-08-06T17:14:32.000+08:00
diff --git a/bitcoin/crypto/adaptor/verify.go b/bitcoin/crypto/adaptor/verify.go
@@ -49,7 +49,7 @@ func verifySchnorrAdaptorSignature(sig *Signature, hash []byte, pubKey *secp256k
 	// 9. Fail if is_infinite(R)
 	// 10. EAP = AR - R if has_even_y(AR) else AR + R; Fail if is_infinite(EAP)
 	// 11. Fail if EAP != AP
-	// 12. Return success iff not failure occured before reaching this
+	// 12. Return success iff not failure occurred before reaching this
 	// point.
 
 	// Step 1.
@@ -181,6 +181,6 @@ func verifySchnorrAdaptorSignature(sig *Signature, hash []byte, pubKey *secp256k
 
 	// Step 12.
 	//
-	// Return success iff not failure occured before reaching this
+	// Return success iff not failure occurred before reaching this
 	return nil
 }
diff --git a/x/btcbridge/types/msg_complete_dkg.go b/x/btcbridge/types/msg_complete_dkg.go
@@ -34,7 +34,7 @@ func (m *MsgCompleteDKG) ValidateBasic() error {
 	}
 
 	if len(m.Vaults) == 0 {
-		return errorsmod.Wrap(ErrInvalidDKGCompletionRequest, "vaults can not be empty")
+		return errorsmod.Wrap(ErrInvalidDKGCompletionRequest, "vaults cannot be empty")
 	}
 
 	vaults := make(map[string]bool)
diff --git a/x/btcbridge/types/msg_submit_signatures.go b/x/btcbridge/types/msg_submit_signatures.go
@@ -30,15 +30,15 @@ func (msg *MsgSubmitSignatures) ValidateBasic() error {
 	}
 
 	if len(msg.Txid) == 0 {
-		return errorsmod.Wrap(ErrInvalidTxHash, "tx id can not be empty")
+		return errorsmod.Wrap(ErrInvalidTxHash, "tx id cannot be empty")
 	}
 
 	if _, err := chainhash.NewHashFromStr(msg.Txid); err != nil {
 		return ErrInvalidTxHash
 	}
 
 	if len(msg.Signatures) == 0 {
-		return errorsmod.Wrap(ErrInvalidSignatures, "signatures can not be empty")
+		return errorsmod.Wrap(ErrInvalidSignatures, "signatures cannot be empty")
 	}
 
 	for _, signature := range msg.Signatures {
diff --git a/x/btcbridge/types/msg_update_trusted_fee_providers.go b/x/btcbridge/types/msg_update_trusted_fee_providers.go
@@ -24,7 +24,7 @@ func (msg *MsgUpdateTrustedFeeProviders) ValidateBasic() error {
 	}
 
 	if len(msg.FeeProviders) == 0 {
-		return errorsmod.Wrapf(ErrInvalidFeeProviders, "fee providers can not be empty")
+		return errorsmod.Wrapf(ErrInvalidFeeProviders, "fee providers cannot be empty")
 	}
 
 	for _, provider := range msg.FeeProviders {
diff --git a/x/btcbridge/types/msg_update_trusted_non_btc_relayers.go b/x/btcbridge/types/msg_update_trusted_non_btc_relayers.go
@@ -24,7 +24,7 @@ func (msg *MsgUpdateTrustedNonBtcRelayers) ValidateBasic() error {
 	}
 
 	if len(msg.Relayers) == 0 {
-		return errorsmod.Wrapf(ErrInvalidRelayers, "relayers can not be empty")
+		return errorsmod.Wrapf(ErrInvalidRelayers, "relayers cannot be empty")
 	}
 
 	for _, relayer := range msg.Relayers {
diff --git a/x/dlc/types/params.go b/x/dlc/types/params.go
@@ -56,7 +56,7 @@ func (p Params) Validate() error {
 	}
 
 	if p.NonceGenerationBatchSize < 2 {
-		return errorsmod.Wrapf(ErrInvalidParams, "nonce generation batch size can not be less than 2")
+		return errorsmod.Wrapf(ErrInvalidParams, "nonce generation batch size cannot be less than 2")
 	}
 
 	if p.NonceGenerationInterval <= 0 {
@@ -72,11 +72,11 @@ func (p Params) Validate() error {
 	}
 
 	if len(p.AllowedOracleParticipants) > 0 && p.OracleParticipantNum > uint32(len(p.AllowedOracleParticipants)) {
-		return errorsmod.Wrapf(ErrInvalidParams, "oracle participant number can not be greater than allowed oracle participant number %d", len(p.AllowedOracleParticipants))
+		return errorsmod.Wrapf(ErrInvalidParams, "oracle participant number cannot be greater than allowed oracle participant number %d", len(p.AllowedOracleParticipants))
 	}
 
 	if p.OracleParticipantNum < MinOracleParticipantNum {
-		return errorsmod.Wrapf(ErrInvalidParams, "oracle participant number can not be less than min oracle participant number %d", MinOracleParticipantNum)
+		return errorsmod.Wrapf(ErrInvalidParams, "oracle participant number cannot be less than min oracle participant number %d", MinOracleParticipantNum)
 	}
 
 	if p.OracleParticipantThreshold == 0 || p.OracleParticipantThreshold > p.OracleParticipantNum {
diff --git a/x/lending/keeper/loan.go b/x/lending/keeper/loan.go
@@ -189,35 +189,6 @@ func (k Keeper) GetLoansByOracle(ctx sdk.Context, oraclePubKey []byte, paginatio
 	return loans, pageRes, nil
 }
 
-// GetPendingLoans gets the requested or authorized loans
-func (k Keeper) GetPendingLoans(ctx sdk.Context) []*types.Loan {
-	var loans []*types.Loan
-
-	requestedLoans := k.GetLoans(ctx, types.LoanStatus_Requested)
-	if len(requestedLoans) != 0 {
-		loans = append(loans, requestedLoans...)
-	}
-
-	authorizedLoans := k.GetLoans(ctx, types.LoanStatus_Authorized)
-	if len(authorizedLoans) != 0 {
-		loans = append(loans, authorizedLoans...)
-	}
-
-	return loans
-}
-
-// GetLiquidatedLoans gets the liquidated loans from the liquidation queue
-func (k Keeper) GetLiquidatedLoans(ctx sdk.Context) []*types.Loan {
-	var loans []*types.Loan
-
-	k.IterateLiquidationQueue(ctx, func(loan *types.Loan) (stop bool) {
-		loans = append(loans, loan)
-		return false
-	})
-
-	return loans
-}
-
 // GetAllLoans returns all loans
 func (k Keeper) GetAllLoans(ctx sdk.Context) []*types.Loan {
 	var loans []*types.Loan
diff --git a/x/lending/keeper/msg_server_loan.go b/x/lending/keeper/msg_server_loan.go
@@ -188,7 +188,7 @@ func (m msgServer) SubmitCets(goCtx context.Context, msg *types.MsgSubmitCets) (
 	}
 
 	if collateralAmount.IsZero() {
-		return nil, errorsmod.Wrap(types.ErrInsufficientCollateral, "collateral amount can not be zero")
+		return nil, errorsmod.Wrap(types.ErrInsufficientCollateral, "collateral amount cannot be zero")
 	}
 
 	// calculate liquidation price
diff --git a/x/lending/types/lending.go b/x/lending/types/lending.go
@@ -225,11 +225,11 @@ func CheckBorrowCap(pool *LendingPool, borrowAmount sdkmath.Int) error {
 // CheckBorrowAmountLimit checks if the borrow amount satisfies limits for the given pool
 func CheckBorrowAmountLimit(pool *LendingPool, borrowAmount sdkmath.Int) error {
 	if HasMinBorrowAmountLimit(pool) && borrowAmount.LT(pool.Config.MinBorrowAmount) {
-		return errorsmod.Wrap(ErrInvalidAmount, "borrow amount can not be less than min borrow amount")
+		return errorsmod.Wrap(ErrInvalidAmount, "borrow amount cannot be less than min borrow amount")
 	}
 
 	if HasMaxBorrowAmountLimit(pool) && borrowAmount.GT(pool.Config.MaxBorrowAmount) {
-		return errorsmod.Wrap(ErrInvalidAmount, "borrow amount can not be greater than max borrow amount")
+		return errorsmod.Wrap(ErrInvalidAmount, "borrow amount cannot be greater than max borrow amount")
 	}
 
 	return nil
diff --git a/x/lending/types/msg_submit_cets.go b/x/lending/types/msg_submit_cets.go
@@ -40,7 +40,7 @@ func (m *MsgSubmitCets) ValidateBasic() error {
 	}
 
 	if len(m.DepositTxs) == 0 {
-		return errorsmod.Wrap(ErrInvalidDepositTxs, "deposit txs can not be empty")
+		return errorsmod.Wrap(ErrInvalidDepositTxs, "deposit txs cannot be empty")
 	}
 
 	depositTxHashes := []string{}
diff --git a/x/oracle/types/block_header.go b/x/oracle/types/block_header.go
@@ -62,7 +62,7 @@ type BlockHeaders []*BlockHeader
 // Validate validates if each block header is valid and if the block headers form a chain
 func (headers BlockHeaders) Validate() error {
 	if len(headers) == 0 {
-		return errorsmod.Wrap(ErrInvalidBlockHeaders, "block headers can not be empty")
+		return errorsmod.Wrap(ErrInvalidBlockHeaders, "block headers cannot be empty")
 	}
 
 	var lastHeight int32
@@ -74,7 +74,7 @@ func (headers BlockHeaders) Validate() error {
 		}
 
 		if i > 0 && h.Height != lastHeight+1 && h.PreviousBlockHash != lastHash {
-			return errorsmod.Wrap(ErrInvalidBlockHeaders, "block headers can not form a chain")
+			return errorsmod.Wrap(ErrInvalidBlockHeaders, "block headers cannot form a chain")
 		}
 
 		lastHeight = h.Height
diff --git a/x/tss/types/msg_complete_dkg.go b/x/tss/types/msg_complete_dkg.go
@@ -36,7 +36,7 @@ func (m *MsgCompleteDKG) ValidateBasic() error {
 	}
 
 	if len(m.PubKeys) == 0 {
-		return errorsmod.Wrap(ErrInvalidPubKeys, "pub keys can not be empty")
+		return errorsmod.Wrap(ErrInvalidPubKeys, "pub keys cannot be empty")
 	}
 
 	for _, pubKey := range m.PubKeys {
diff --git a/x/tss/types/msg_submit_signatures.go b/x/tss/types/msg_submit_signatures.go
@@ -28,7 +28,7 @@ func (m *MsgSubmitSignatures) ValidateBasic() error {
 	}
 
 	if len(m.Signatures) == 0 {
-		return errorsmod.Wrap(ErrInvalidSignatures, "signatures can not be empty")
+		return errorsmod.Wrap(ErrInvalidSignatures, "signatures cannot be empty")
 	}
 
 	for _, signature := range m.Signatures {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func (m *MsgCompleteDKG) ValidateBasic() error {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`if len(m.Vaults) == 0 {`
`37`		`- return errorsmod.Wrap(ErrInvalidDKGCompletionRequest, "vaults can not be empty")`
	`37`	`+ return errorsmod.Wrap(ErrInvalidDKGCompletionRequest, "vaults cannot be empty")`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`vaults := make(map[string]bool)`
Original file line number	Diff line number	Diff line change
`@@ -30,15 +30,15 @@ func (msg *MsgSubmitSignatures) ValidateBasic() error {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`if len(msg.Txid) == 0 {`
`33`		`- return errorsmod.Wrap(ErrInvalidTxHash, "tx id can not be empty")`
	`33`	`+ return errorsmod.Wrap(ErrInvalidTxHash, "tx id cannot be empty")`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`if _, err := chainhash.NewHashFromStr(msg.Txid); err != nil {`
`37`	`37`	`return ErrInvalidTxHash`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`if len(msg.Signatures) == 0 {`
`41`		`- return errorsmod.Wrap(ErrInvalidSignatures, "signatures can not be empty")`
	`41`	`+ return errorsmod.Wrap(ErrInvalidSignatures, "signatures cannot be empty")`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`for _, signature := range msg.Signatures {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func (msg *MsgUpdateTrustedFeeProviders) ValidateBasic() error {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`if len(msg.FeeProviders) == 0 {`
`27`		`- return errorsmod.Wrapf(ErrInvalidFeeProviders, "fee providers can not be empty")`
	`27`	`+ return errorsmod.Wrapf(ErrInvalidFeeProviders, "fee providers cannot be empty")`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`for _, provider := range msg.FeeProviders {`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func (p Params) Validate() error {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`if p.NonceGenerationBatchSize < 2 {`
`59`		`- return errorsmod.Wrapf(ErrInvalidParams, "nonce generation batch size can not be less than 2")`
	`59`	`+ return errorsmod.Wrapf(ErrInvalidParams, "nonce generation batch size cannot be less than 2")`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`if p.NonceGenerationInterval <= 0 {`
`@@ -72,11 +72,11 @@ func (p Params) Validate() error {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`if len(p.AllowedOracleParticipants) > 0 && p.OracleParticipantNum > uint32(len(p.AllowedOracleParticipants)) {`
`75`		`- return errorsmod.Wrapf(ErrInvalidParams, "oracle participant number can not be greater than allowed oracle participant number %d", len(p.AllowedOracleParticipants))`
	`75`	`+ return errorsmod.Wrapf(ErrInvalidParams, "oracle participant number cannot be greater than allowed oracle participant number %d", len(p.AllowedOracleParticipants))`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`if p.OracleParticipantNum < MinOracleParticipantNum {`
`79`		`- return errorsmod.Wrapf(ErrInvalidParams, "oracle participant number can not be less than min oracle participant number %d", MinOracleParticipantNum)`
	`79`	`+ return errorsmod.Wrapf(ErrInvalidParams, "oracle participant number cannot be less than min oracle participant number %d", MinOracleParticipantNum)`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`if p.OracleParticipantThreshold == 0 \|\| p.OracleParticipantThreshold > p.OracleParticipantNum {`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ func (m msgServer) SubmitCets(goCtx context.Context, msg *types.MsgSubmitCets) (`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`if collateralAmount.IsZero() {`
`191`		`- return nil, errorsmod.Wrap(types.ErrInsufficientCollateral, "collateral amount can not be zero")`
	`191`	`+ return nil, errorsmod.Wrap(types.ErrInsufficientCollateral, "collateral amount cannot be zero")`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`// calculate liquidation price`
Original file line number	Diff line number	Diff line change
`@@ -225,11 +225,11 @@ func CheckBorrowCap(pool *LendingPool, borrowAmount sdkmath.Int) error {`
`225`	`225`	`// CheckBorrowAmountLimit checks if the borrow amount satisfies limits for the given pool`
`226`	`226`	`func CheckBorrowAmountLimit(pool *LendingPool, borrowAmount sdkmath.Int) error {`
`227`	`227`	`if HasMinBorrowAmountLimit(pool) && borrowAmount.LT(pool.Config.MinBorrowAmount) {`
`228`		`- return errorsmod.Wrap(ErrInvalidAmount, "borrow amount can not be less than min borrow amount")`
	`228`	`+ return errorsmod.Wrap(ErrInvalidAmount, "borrow amount cannot be less than min borrow amount")`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`if HasMaxBorrowAmountLimit(pool) && borrowAmount.GT(pool.Config.MaxBorrowAmount) {`
`232`		`- return errorsmod.Wrap(ErrInvalidAmount, "borrow amount can not be greater than max borrow amount")`
	`232`	`+ return errorsmod.Wrap(ErrInvalidAmount, "borrow amount cannot be greater than max borrow amount")`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func (m *MsgSubmitCets) ValidateBasic() error {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`if len(m.DepositTxs) == 0 {`
`43`		`- return errorsmod.Wrap(ErrInvalidDepositTxs, "deposit txs can not be empty")`
	`43`	`+ return errorsmod.Wrap(ErrInvalidDepositTxs, "deposit txs cannot be empty")`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`depositTxHashes := []string{}`