reverted to nominator instead of numerator

Author: ducphamle2

contracts/cw-ics20-latest/src/contract.rs

@@ -1231,11 +1231,11 @@ mod test {
         let cw20_raw_denom = token_addr.as_str();
         let local_channel = "channel-1234";
         let ratio = Ratio {
-            numerator: 1,
+            nominator: 1,
             denominator: 10,
         };
         let fee_amount =
-            Uint128::from(amount) * Decimal::from_ratio(ratio.numerator, ratio.denominator);
+            Uint128::from(amount) * Decimal::from_ratio(ratio.nominator, ratio.denominator);
         let mut deps = setup(&[remote_channel, local_channel], &[]);
         TOKEN_FEE
             .save(deps.as_mut().storage, denom, &ratio)
@@ -1420,11 +1420,11 @@ mod test {
         let cw20_raw_denom = original_sender;
         let local_channel = "channel-1234";
         let ratio = Ratio {
-            numerator: 1,
+            nominator: 1,
             denominator: 10,
         };
         let fee_amount =
-            Uint128::from(amount) * Decimal::from_ratio(ratio.numerator, ratio.denominator);
+            Uint128::from(amount) * Decimal::from_ratio(ratio.nominator, ratio.denominator);
         let mut deps = setup(&[remote_channel, local_channel], &[]);
         TOKEN_FEE
             .save(deps.as_mut().storage, denom, &ratio)
@@ -1587,14 +1587,14 @@ mod test {
                 TokenFee {
                     token_denom: "orai".to_string(),
                     ratio: Ratio {
-                        numerator: 1,
+                        nominator: 1,
                         denominator: 10,
                     },
                 },
                 TokenFee {
                     token_denom: "atom".to_string(),
                     ratio: Ratio {
-                        numerator: 1,
+                        nominator: 1,
                         denominator: 5,
                     },
                 },

contracts/cw-ics20-latest/src/ibc.rs

@@ -945,7 +945,7 @@ pub fn deduct_fee(token_fee: Ratio, amount: Uint128) -> Uint128 {
         return Uint128::from(0u64);
     }
     amount.mul(Decimal::from_ratio(
-        token_fee.numerator,
+        token_fee.nominator,
         token_fee.denominator,
     ))
 }

contracts/cw-ics20-latest/src/ibc_tests.rs

@@ -249,7 +249,7 @@ mod test {
                 deps.as_mut().storage,
                 denom,
                 &Ratio {
-                    numerator: 1,
+                    nominator: 1,
                     denominator: 10,
                 },
             )
@@ -962,7 +962,7 @@ mod test {
         assert_eq!(
             deduct_fee(
                 Ratio {
-                    numerator: 1,
+                    nominator: 1,
                     denominator: 0,
                 },
                 Uint128::from(1000u64)
@@ -972,7 +972,7 @@ mod test {
         assert_eq!(
             deduct_fee(
                 Ratio {
-                    numerator: 1,
+                    nominator: 1,
                     denominator: 1,
                 },
                 Uint128::from(1000u64)
@@ -982,7 +982,7 @@ mod test {
         assert_eq!(
             deduct_fee(
                 Ratio {
-                    numerator: 1,
+                    nominator: 1,
                     denominator: 100,
                 },
                 Uint128::from(1000u64)
@@ -1042,7 +1042,7 @@ mod test {
                 storage,
                 token_fee_denom,
                 &Ratio {
-                    numerator: 1,
+                    nominator: 1,
                     denominator: 100,
                 },
             )

contracts/cw-ics20-latest/src/state.rs

@@ -117,7 +117,7 @@ pub struct RelayerFee {
 
 #[cw_serde]
 pub struct Ratio {
-    pub numerator: u64,
+    pub nominator: u64,
     pub denominator: u64,
 }