Update sqlx

Signed-off-by: deniallugo <[email protected]>
matter-labs · May 21, 2021 · d3cddf2 · d3cddf2
1 parent c32284b
commit d3cddf2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/core/lib/storage/sqlx-data.json b/core/lib/storage/sqlx-data.json
@@ -924,20 +924,6 @@
       "nullable": []
     }
   },
-  "1dfe010be8194296b893b596337eb89f95a1381c888e0723d7b7a950bd909122": {
-    "query": "\n            INSERT INTO nft_factory ( creator_id, factory_address, creator_address )\n            VALUES ( $1, $2, $3 )\n            ",
-    "describe": {
-      "columns": [],
-      "parameters": {
-        "Left": [
-          "Int4",
-          "Text",
-          "Text"
-        ]
-      },
-      "nullable": []
-    }
-  },
   "1e491f4afb54c10a9e4f2ea467bd7f219e7a32bdf741691cb6f350d50caae417": {
     "query": "\n            UPDATE forced_exit_requests\n                SET fulfilled_at = $1\n                WHERE id = $2\n            ",
     "describe": {
@@ -1621,6 +1607,20 @@
       "nullable": []
     }
   },
+  "44c99a84f28659435e9cae90670179cf2e49b789abeee4754a8f830a2eead483": {
+    "query": "\n            INSERT INTO nft_factory ( creator_id, factory_address, creator_address )\n            VALUES ( $1, $2, $3 )\n            ON CONFLICT ( creator_id ) \n            DO UPDATE \n            SET factory_address = $2 \n            ",
+    "describe": {
+      "columns": [],
+      "parameters": {
+        "Left": [
+          "Int4",
+          "Text",
+          "Text"
+        ]
+      },
+      "nullable": []
+    }
+  },
   "44e5ba11f839c21a12e1cee81b31e848f0e87e23cc9e16e136a88a6ae7c84303": {
     "query": "INSERT INTO proofs (block_number, proof)\n            VALUES ($1, $2)",
     "describe": {

diff --git a/core/tests/ts-tests/tests/main.test.ts b/core/tests/ts-tests/tests/main.test.ts
@@ -89,7 +89,7 @@ describe(`ZkSync integration tests (token: ${token}, transport: ${transport})`,
     });
 
     step('should execute a mintNFT', async () => {
-        nft =  await tester.testMintNFT(alice, chuck,  token, true);
+        nft =  await tester.testMintNFT(alice, chuck,  token);
     });
     step('should execute a getNFT', async () => {
         await tester.testGetNFT(alice, token);

diff --git a/core/tests/ts-tests/tests/mint-nft.ts b/core/tests/ts-tests/tests/mint-nft.ts
@@ -35,6 +35,7 @@ Tester.prototype.testMintNFT = async function (
         fee
     });
 
+    this.runningFee = this.runningFee.add(fee);
     const balanceBefore = await wallet.getBalance(feeToken);
     let receipt;
     if (waitVerified === true) {
@@ -53,7 +54,6 @@ Tester.prototype.testMintNFT = async function (
     expect(nft !== undefined);
     expect(nft.contentHash).eq(utils.hexlify(contentHash));
 
-    this.runningFee = this.runningFee.add(fee);
     return nft;
 };