Merge PR #3864: Make IsAllGTE() more consistent

* Make IsAllGTE() more consistent Co-Authored-By: alessio <quadrispro@ubuntu.com>
cosmos · Mar 12, 2019 · 7af11ec · 7af11ec
1 parent f97e85e
commit 7af11ec
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/PENDING.md b/PENDING.md
@@ -48,6 +48,8 @@
 ### SDK
 
 * [\#3820] Make Coins.IsAllGT() more robust and consistent.
+* [\#3864] Make Coins.IsAllGTE() more consistent.
+
 * #3801 `baseapp` saftey improvements
 
 ### Tendermint

diff --git a/types/coin.go b/types/coin.go
@@ -336,15 +336,25 @@ func (coins Coins) IsAllGT(coinsB Coins) bool {
 	return true
 }
 
-// IsAllGTE returns true iff for every denom in coins, the denom is present at
-// an equal or greater amount in coinsB.
+// IsAllGTE returns false if for any denom in coinsB,
+// the denom is present at a smaller amount in coins;
+// else returns true.
 func (coins Coins) IsAllGTE(coinsB Coins) bool {
-	diff, _ := coins.SafeSub(coinsB)
-	if len(diff) == 0 {
+	if len(coinsB) == 0 {
 		return true
 	}
 
-	return !diff.IsAnyNegative()
+	if len(coins) == 0 {
+		return false
+	}
+
+	for _, coinB := range coinsB {
+		if coinB.Amount.GT(coins.AmountOf(coinB.Denom)) {
+			return false
+		}
+	}
+
+	return true
 }
 
 // IsAllLT returns True iff for every denom in coins, the denom is present at

diff --git a/types/coin_test.go b/types/coin_test.go
@@ -332,18 +332,6 @@ func TestCoinsGT(t *testing.T) {
 	assert.False(t, Coins{{testDenom1, one}, {testDenom2, one}}.IsAllGT(Coins{{testDenom2, two}}))
 }
 
-func TestCoinsGTE(t *testing.T) {
-	one := NewInt(1)
-	two := NewInt(2)
-
-	assert.True(t, Coins{}.IsAllGTE(Coins{}))
-	assert.True(t, Coins{{testDenom1, one}}.IsAllGTE(Coins{}))
-	assert.True(t, Coins{{testDenom1, one}}.IsAllGTE(Coins{{testDenom1, one}}))
-	assert.False(t, Coins{{testDenom1, one}}.IsAllGTE(Coins{{testDenom2, one}}))
-	assert.True(t, Coins{{testDenom1, one}, {testDenom2, one}}.IsAllGTE(Coins{{testDenom2, one}}))
-	assert.False(t, Coins{{testDenom1, one}, {testDenom2, one}}.IsAllGTE(Coins{{testDenom2, two}}))
-}
-
 func TestCoinsLT(t *testing.T) {
 	one := NewInt(1)
 	two := NewInt(2)
@@ -543,6 +531,8 @@ func TestCoinsIsAllGTE(t *testing.T) {
 
 	assert.True(t, Coins{}.IsAllGTE(Coins{}))
 	assert.True(t, Coins{{testDenom1, one}}.IsAllGTE(Coins{}))
+	assert.True(t, Coins{{testDenom1, one}, {testDenom2, one}}.IsAllGTE(Coins{{testDenom2, one}}))
+	assert.False(t, Coins{{testDenom1, one}, {testDenom2, one}}.IsAllGTE(Coins{{testDenom2, two}}))
 	assert.False(t, Coins{}.IsAllGTE(Coins{{testDenom1, one}}))
 	assert.False(t, Coins{{testDenom1, one}}.IsAllGTE(Coins{{testDenom1, two}}))
 	assert.False(t, Coins{{testDenom1, one}}.IsAllGTE(Coins{{testDenom2, one}}))