Merge pull request #165 from bosonprotocol/unit-tests-revision

Unit tests - 2_test_fullpath_with_permit
bosonprotocol · Oct 13, 2021 · 5d17584 · 5d17584
2 parents 5319bbb + 7869e6d
commit 5d17584
Show file tree

Hide file tree

Showing 9 changed files with 4,768 additions and 2,604 deletions.
diff --git a/contracts/BosonRouter.sol b/contracts/BosonRouter.sol
@@ -700,6 +700,13 @@ contract BosonRouter is
         address tokenPriceAddress = IVoucherKernel(voucherKernel)
             .getVoucherPriceToken(_tokenIdSupply);
 
+        IVoucherKernel(voucherKernel).fillOrder(
+            _tokenIdSupply,
+            _issuer,
+            msg.sender,
+            TKNETH
+        );
+
         permitTransferFromAndAddEscrow(
             tokenPriceAddress,
             price,
@@ -708,14 +715,7 @@ contract BosonRouter is
             _r,
             _s
         );
-
-        IVoucherKernel(voucherKernel).fillOrder(
-            _tokenIdSupply,
-            _issuer,
-            msg.sender,
-            TKNETH
-        );
-
+
         //record funds in escrow ...
         ICashier(cashierAddress).addEscrowAmount{value: msg.value}(msg.sender);
     }

diff --git a/test/11_gate.ts b/test/11_gate.ts
@@ -219,10 +219,13 @@ describe('Gate contract', async () => {
       users.seller,
       timestamp,
       timestamp + constants.SECONDS_IN_DAY,
+      constants.product_price,
       constants.seller_deposit,
+      constants.buyer_deposit,
       constants.QTY_10,
       gate,
-      conditionalOrderNftTokenID
+      conditionalOrderNftTokenID,
+      true
     );
 
     const txReceipt = await txOrder.wait();
@@ -475,7 +478,13 @@ describe('Gate contract', async () => {
         expect(await contractGate.check(users.buyer.address, tokenId)).to.be
           .true;
 
-        await utils.commitToBuy(users.buyer, users.seller, tokenId);
+        await utils.commitToBuy(
+          users.buyer,
+          users.seller,
+          tokenId,
+          constants.product_price,
+          constants.buyer_deposit
+        );
 
         expect(await contractGate.check(users.buyer.address, tokenId)).to.be
           .false;

diff --git a/test/12_conditional_commit.ts b/test/12_conditional_commit.ts
@@ -1827,10 +1827,13 @@ describe('Create Voucher sets and commit to vouchers with token conditional comm
           users.seller,
           constants.PROMISE_VALID_FROM,
           constants.PROMISE_VALID_TO,
+          constants.product_price,
           constants.PROMISE_DEPOSITSE1,
+          constants.buyer_deposit,
           constants.QTY_10,
           contractGate,
-          0
+          0,
+          true
         );
 
         const txReceipt = await txOrder.wait();
@@ -1929,7 +1932,13 @@ describe('Create Voucher sets and commit to vouchers with token conditional comm
       });
 
       it('[NEGATIVE] Should not be able to request voucher twice', async () => {
-        await utils.commitToBuy(users.buyer, users.seller, tokenSupplyKey);
+        await utils.commitToBuy(
+          users.buyer,
+          users.seller,
+          tokenSupplyKey,
+          constants.product_price,
+          constants.buyer_deposit
+        );
 
         const {txValue, DEPOSIT, PRICE} = await generateInputs(
           users.buyer,
@@ -2000,7 +2009,9 @@ describe('Create Voucher sets and commit to vouchers with token conditional comm
           users.seller,
           timestamp,
           timestamp + constants.SECONDS_IN_DAY,
+          constants.product_price,
           constants.seller_deposit,
+          constants.buyer_deposit,
           constants.QTY_10,
           users.other1, /// gate address that maps to EOA
           0
@@ -2045,7 +2056,9 @@ describe('Create Voucher sets and commit to vouchers with token conditional comm
           users.seller,
           timestamp,
           timestamp + constants.SECONDS_IN_DAY,
+          constants.product_price,
           constants.seller_deposit,
+          constants.buyer_deposit,
           constants.QTY_10,
           contractGate,
           0
@@ -2154,10 +2167,13 @@ describe('Create Voucher sets and commit to vouchers with token conditional comm
           users.seller,
           constants.PROMISE_VALID_FROM,
           constants.PROMISE_VALID_TO,
+          constants.product_price,
           constants.PROMISE_DEPOSITSE1,
+          constants.buyer_deposit,
           constants.QTY_10,
           contractGate,
-          0
+          0,
+          true
         );
 
         const txReceipt = await txOrder.wait();
@@ -2314,7 +2330,9 @@ describe('Create Voucher sets and commit to vouchers with token conditional comm
           users.seller,
           timestamp,
           timestamp + constants.SECONDS_IN_DAY,
+          constants.product_price,
           constants.seller_deposit,
+          constants.buyer_deposit,
           constants.QTY_10,
           users.other1, /// gate address that maps to EOA
           0
@@ -2349,7 +2367,9 @@ describe('Create Voucher sets and commit to vouchers with token conditional comm
           users.seller,
           timestamp,
           timestamp + constants.SECONDS_IN_DAY,
+          constants.product_price,
           constants.seller_deposit,
+          constants.buyer_deposit,
           constants.QTY_10,
           contractGate,
           0