Add final cache limit tests

mstable · Dec 23, 2020 · e17a814 · e17a814
1 parent dc7c865
commit e17a814
Show file tree

Hide file tree

Showing 5 changed files with 312 additions and 61 deletions.
diff --git a/contracts/masset/Masset.sol b/contracts/masset/Masset.sol
@@ -290,7 +290,6 @@ contract Masset is
         // 2.2 - Else Deposit X if Cache > %
         else {
             // This check is in place to ensure that any token with a txFee is rejected
-            // Audit notes: Assumption made that if no fee is collected here then there is no txfee
             require(transferred == _quantity, "Asset not fully transferred");
 
             quantityDeposited = transferred;

diff --git a/test-utils/machines/massetMachine.ts b/test-utils/machines/massetMachine.ts
@@ -591,6 +591,14 @@ export class MassetMachine {
         integratorBalBefore: number | BN,
         bAsset: Basset,
     ): Promise<ActionDetails> {
+        const hasTxFee = bAsset.isTransferFeeCharged;
+        if (hasTxFee) {
+            return {
+                expectInteraction: true,
+                amount,
+                rawBalance: new BN(0),
+            };
+        }
         const totalSupply = await mAsset.totalSupply();
         const surplus = await mAsset.surplus();
         const cacheSize = await mAsset.cacheSize();

diff --git a/test-utils/math.ts b/test-utils/math.ts
@@ -74,7 +74,7 @@ export const applyRatioMassetToBasset = (input: BN, ratio: BN | string): BN => {
 };
 
 // How many mAssets is this bAsset worth
-export const applyRatio = (bAssetQ: BN | string, ratio: BN | string): BN => {
+export const applyRatio = (bAssetQ: BN | string | number, ratio: BN | string): BN => {
     return new BN(bAssetQ).mul(new BN(ratio)).div(ratioScale);
 };