fix(types): use correct bit length constant for sdk.Dec (backport cos…

…mos#11332) (cosmos#11335) * Use correct bit length constant for sdk.Dec (cosmos#11332) Co-authored-by: Marko <marbar3778@yahoo.com> (cherry picked from commit 3d3cf25) # Conflicts: # go.sum * fix conflicts Co-authored-by: Julien Robert <julien@rbrt.fr> Co-authored-by: marbar3778 <marbar3778@yahoo.com>
agoric-labs · Jul 7, 2022 · 63771a1 · 63771a1
1 parent 367809f
commit 63771a1
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/types/decimal.go b/types/decimal.go
@@ -179,8 +179,8 @@ func NewDecFromStr(str string) (Dec, error) {
 	if !ok {
 		return Dec{}, fmt.Errorf("failed to set decimal string: %s", combinedStr)
 	}
-	if combined.BitLen() > maxBitLen {
-		return Dec{}, fmt.Errorf("decimal out of range; bitLen: got %d, max %d", combined.BitLen(), maxBitLen)
+	if combined.BitLen() > maxDecBitLen {
+		return Dec{}, fmt.Errorf("decimal out of range; bitLen: got %d, max %d", combined.BitLen(), maxDecBitLen)
 	}
 	if neg {
 		combined = new(big.Int).Neg(combined)
@@ -744,8 +744,8 @@ func (d *Dec) Unmarshal(data []byte) error {
 		return err
 	}
 
-	if d.i.BitLen() > maxBitLen {
-		return fmt.Errorf("decimal out of range; got: %d, max: %d", d.i.BitLen(), maxBitLen)
+	if d.i.BitLen() > maxDecBitLen {
+		return fmt.Errorf("decimal out of range; got: %d, max: %d", d.i.BitLen(), maxDecBitLen)
 	}
 
 	return nil

diff --git a/types/decimal_test.go b/types/decimal_test.go
@@ -30,8 +30,14 @@ func (s *decimalTestSuite) mustNewDecFromStr(str string) (d sdk.Dec) {
 }
 
 func (s *decimalTestSuite) TestNewDecFromStr() {
-	largeBigInt, success := new(big.Int).SetString("3144605511029693144278234343371835", 10)
-	s.Require().True(success)
+	largeBigInt, ok := new(big.Int).SetString("3144605511029693144278234343371835", 10)
+	s.Require().True(ok)
+
+	largerBigInt, ok := new(big.Int).SetString("88888888888888888888888888888888888888888888888888888888888888888888844444440", 10)
+	s.Require().True(ok)
+
+	largestBigInt, ok := new(big.Int).SetString("133499189745056880149688856635597007162669032647290798121690100488888732861290034376435130433535", 10)
+	s.Require().True(ok)
 
 	tests := []struct {
 		decimalStr string
@@ -57,7 +63,9 @@ func (s *decimalTestSuite) TestNewDecFromStr() {
 		{"foobar", true, sdk.Dec{}},
 		{"0.foobar", true, sdk.Dec{}},
 		{"0.foobar.", true, sdk.Dec{}},
-		{"88888888888888888888888888888888888888888888888888888888888888888888844444440", true, sdk.Dec{}},
+		{"88888888888888888888888888888888888888888888888888888888888888888888844444440", false, sdk.NewDecFromBigInt(largerBigInt)},
+		{"133499189745056880149688856635597007162669032647290798121690100488888732861290.034376435130433535", false, sdk.NewDecFromBigIntWithPrec(largestBigInt, 18)},
+		{"133499189745056880149688856635597007162669032647290798121690100488888732861291", true, sdk.Dec{}},
 	}
 
 	for tcIndex, tc := range tests {
@@ -441,6 +449,12 @@ func (s *decimalTestSuite) TestDecSortableBytes() {
 }
 
 func (s *decimalTestSuite) TestDecEncoding() {
+	largestBigInt, ok := new(big.Int).SetString("133499189745056880149688856635597007162669032647290798121690100488888732861290034376435130433535", 10)
+	s.Require().True(ok)
+
+	smallestBigInt, ok := new(big.Int).SetString("-133499189745056880149688856635597007162669032647290798121690100488888732861290034376435130433535", 10)
+	s.Require().True(ok)
+
 	testCases := []struct {
 		input   sdk.Dec
 		rawBz   string
@@ -476,6 +490,18 @@ func (s *decimalTestSuite) TestDecEncoding() {
 			"\"-1.414213562373095049\"",
 			"\"-1.414213562373095049\"\n",
 		},
+		{
+			sdk.NewDecFromBigIntWithPrec(largestBigInt, 18),
+			"313333343939313839373435303536383830313439363838383536363335353937303037313632363639303332363437323930373938313231363930313030343838383838373332383631323930303334333736343335313330343333353335",
+			"\"133499189745056880149688856635597007162669032647290798121690100488888732861290.034376435130433535\"",
+			"\"133499189745056880149688856635597007162669032647290798121690100488888732861290.034376435130433535\"\n",
+		},
+		{
+			sdk.NewDecFromBigIntWithPrec(smallestBigInt, 18),
+			"2D313333343939313839373435303536383830313439363838383536363335353937303037313632363639303332363437323930373938313231363930313030343838383838373332383631323930303334333736343335313330343333353335",
+			"\"-133499189745056880149688856635597007162669032647290798121690100488888732861290.034376435130433535\"",
+			"\"-133499189745056880149688856635597007162669032647290798121690100488888732861290.034376435130433535\"\n",
+		},
 	}
 
 	for _, tc := range testCases {