Fix tests

cosmos · Feb 22, 2024 · fe75550 · fe75550
1 parent 54e29ff
commit fe75550
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 42 deletions.
diff --git a/types/coin_regex.go b/types/coin_regex.go
diff --git a/types/coin_regex.rl b/types/coin_regex.rl
@@ -38,12 +38,13 @@ func MatchDenom(data []byte) bool {
     return false
 }
 
-func MatchDecCoin(data []byte) (amountStart, amountEnd, denomEnd int, isValid bool) {
+func MatchDecCoin(data []byte) (amountStart, amountEnd, denomStart, denomEnd int, isValid bool) {
+
     %% machine dec_coin;
     %% write data;
 
     // Initialize positions and validity flag
-    amountStart, amountEnd, denomEnd = -1, -1, -1
+    amountStart, amountEnd, denomStart, denomEnd = -1, -1, -1, -1
     isValid = false
 
     // Ragel state variables
@@ -57,6 +58,9 @@ func MatchDecCoin(data []byte) (amountStart, amountEnd, denomEnd int, isValid bo
         action EndAmount {
             amountEnd = p;
         }
+        action StartDenom {
+            denomStart =  p-1;
+        }
         action EndDenom {
             denomEnd = p-1; // Adjusted to exclude space if present
         }
@@ -68,7 +72,8 @@ func MatchDecCoin(data []byte) (amountStart, amountEnd, denomEnd int, isValid bo
 
         dec_amt = (digit+ >StartAmount ('.' digit+)? %EndAmount) | ('.' >StartAmount digit+ %EndAmount);
 
-        denom = [a-zA-Z] (alnum | special){2,127} %EndDenom;
+
+        denom = [a-zA-Z] (alnum | special){2,127} >StartDenom %EndDenom;
 
         main := dec_amt (space* denom)?;
 
@@ -79,5 +84,5 @@ func MatchDecCoin(data []byte) (amountStart, amountEnd, denomEnd int, isValid bo
     isValid = (cs >= %%{ write first_final; }%%);
 
     // Return the captured positions and validity
-    return amountStart, amountEnd, denomEnd, isValid
+    return amountStart, amountEnd, denomStart, denomEnd, isValid
 }
diff --git a/types/dec_coin.go b/types/dec_coin.go
@@ -631,15 +631,15 @@ func (coins DecCoins) Sort() DecCoins {
 // invalid. An empty string is considered invalid.
 func ParseDecCoin(coinStr string) (coin DecCoin, err error) {
 	coinStr = strings.TrimSpace(coinStr)
-	amountStart, amountEnd, denomEnd, isValid := MatchDecCoin([]byte(coinStr))
+	amountStart, amountEnd, denomStart, denomEnd, isValid := MatchDecCoin([]byte(coinStr))
 
 	if !isValid {
 		return DecCoin{}, fmt.Errorf("invalid decimal coin expression: %s", coinStr)
 	}
 
 	// Extract amount and denomination using the positions returned by MatchDecCoin
-	amountStr := coinStr[amountStart:amountEnd]
-	denomStr := coinStr[amountEnd : denomEnd+1]
+	amountStr := coinStr[amountStart:amountEnd] // Adjusted to include amountEnd
+	denomStr := coinStr[denomStart : denomEnd+1]
 
 	amount, err := math.LegacyNewDecFromStr(amountStr)
 	if err != nil {