From d8513893546bd7650cb75c3d7a19076f7733f367 Mon Sep 17 00:00:00 2001
From: Pavel <pavel.cheremushkin@gmail.com>
Date: Fri, 2 Aug 2024 18:20:16 +0200
Subject: [PATCH] test: replace contracts

---
 .gitignore                                     |  1 +
 .../contracts => contracts_bkp}/Caller.sol     |  0
 .../contracts => contracts_bkp}/Greeter.sol    |  0
 .../InitialMultiTransfer.sol                   |  0
 .../contracts => contracts_bkp}/L1.sol         |  0
 .../contracts => contracts_bkp}/Middle.sol     |  0
 .../contracts => contracts_bkp}/MyERC20.sol    |  0
 .../contracts => contracts_bkp}/MyNFT.sol      |  0
 .../MyPaymaster.sol                            |  0
 .../contracts => contracts_bkp}/Root.sol       |  0
 .../scenarios/deploy/deployERC20toL2.ts        | 18 +++++++++---------
 11 files changed, 10 insertions(+), 9 deletions(-)
 rename packages/integration-tests/{src/playbook/contracts => contracts_bkp}/Caller.sol (100%)
 rename packages/integration-tests/{src/playbook/contracts => contracts_bkp}/Greeter.sol (100%)
 rename packages/integration-tests/{src/playbook/contracts => contracts_bkp}/InitialMultiTransfer.sol (100%)
 rename packages/integration-tests/{src/playbook/contracts => contracts_bkp}/L1.sol (100%)
 rename packages/integration-tests/{src/playbook/contracts => contracts_bkp}/Middle.sol (100%)
 rename packages/integration-tests/{src/playbook/contracts => contracts_bkp}/MyERC20.sol (100%)
 rename packages/integration-tests/{src/playbook/contracts => contracts_bkp}/MyNFT.sol (100%)
 rename packages/integration-tests/{src/playbook/contracts => contracts_bkp}/MyPaymaster.sol (100%)
 rename packages/integration-tests/{src/playbook/contracts => contracts_bkp}/Root.sol (100%)

diff --git a/.gitignore b/.gitignore
index 019fb98693..a17fd515f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ cypress/screenshots/
 tests/e2e/reports/
 **/tests/e2e/artifacts/
 **/playbook/deployments-zk/
+**/playbook/typechain-types/
 **/playbook/artifacts-zk/
 **/playbook/artifacts/
 **/playbook/buffer/
diff --git a/packages/integration-tests/src/playbook/contracts/Caller.sol b/packages/integration-tests/contracts_bkp/Caller.sol
similarity index 100%
rename from packages/integration-tests/src/playbook/contracts/Caller.sol
rename to packages/integration-tests/contracts_bkp/Caller.sol
diff --git a/packages/integration-tests/src/playbook/contracts/Greeter.sol b/packages/integration-tests/contracts_bkp/Greeter.sol
similarity index 100%
rename from packages/integration-tests/src/playbook/contracts/Greeter.sol
rename to packages/integration-tests/contracts_bkp/Greeter.sol
diff --git a/packages/integration-tests/src/playbook/contracts/InitialMultiTransfer.sol b/packages/integration-tests/contracts_bkp/InitialMultiTransfer.sol
similarity index 100%
rename from packages/integration-tests/src/playbook/contracts/InitialMultiTransfer.sol
rename to packages/integration-tests/contracts_bkp/InitialMultiTransfer.sol
diff --git a/packages/integration-tests/src/playbook/contracts/L1.sol b/packages/integration-tests/contracts_bkp/L1.sol
similarity index 100%
rename from packages/integration-tests/src/playbook/contracts/L1.sol
rename to packages/integration-tests/contracts_bkp/L1.sol
diff --git a/packages/integration-tests/src/playbook/contracts/Middle.sol b/packages/integration-tests/contracts_bkp/Middle.sol
similarity index 100%
rename from packages/integration-tests/src/playbook/contracts/Middle.sol
rename to packages/integration-tests/contracts_bkp/Middle.sol
diff --git a/packages/integration-tests/src/playbook/contracts/MyERC20.sol b/packages/integration-tests/contracts_bkp/MyERC20.sol
similarity index 100%
rename from packages/integration-tests/src/playbook/contracts/MyERC20.sol
rename to packages/integration-tests/contracts_bkp/MyERC20.sol
diff --git a/packages/integration-tests/src/playbook/contracts/MyNFT.sol b/packages/integration-tests/contracts_bkp/MyNFT.sol
similarity index 100%
rename from packages/integration-tests/src/playbook/contracts/MyNFT.sol
rename to packages/integration-tests/contracts_bkp/MyNFT.sol
diff --git a/packages/integration-tests/src/playbook/contracts/MyPaymaster.sol b/packages/integration-tests/contracts_bkp/MyPaymaster.sol
similarity index 100%
rename from packages/integration-tests/src/playbook/contracts/MyPaymaster.sol
rename to packages/integration-tests/contracts_bkp/MyPaymaster.sol
diff --git a/packages/integration-tests/src/playbook/contracts/Root.sol b/packages/integration-tests/contracts_bkp/Root.sol
similarity index 100%
rename from packages/integration-tests/src/playbook/contracts/Root.sol
rename to packages/integration-tests/contracts_bkp/Root.sol
diff --git a/packages/integration-tests/src/playbook/scenarios/deploy/deployERC20toL2.ts b/packages/integration-tests/src/playbook/scenarios/deploy/deployERC20toL2.ts
index f7ebf8637f..7ac4432c11 100644
--- a/packages/integration-tests/src/playbook/scenarios/deploy/deployERC20toL2.ts
+++ b/packages/integration-tests/src/playbook/scenarios/deploy/deployERC20toL2.ts
@@ -10,14 +10,14 @@ export const deployERC20toL2 = async function () {
   await helper.printLog(bufferFile);
 
   await helper.executeScript(`cd ${playbookRoot} && npm run compile`);
-  await helper.delay(1500);
-  // await helper.executeScript(`cd ${playbookRoot} && npm run deployToL2`); Test only compilation on CI
   // await helper.delay(1500);
-  // // await helper.executeScript(`cat ${bufferFile}`);
-  // await helper.printLog(`Return to the initial script: deployERC20toL2`);
-  // const deployedToken = await helper.getStringFromFile(bufferFile);
-  // await helper.printLog(`Before the latest PRINT in global`);
-  // await helper.printLog("The custom ERC20 token has been deployed to L2: " + Logger.textSeparator + deployedToken);
-  // await helper.printLog(`Before Return in global`);
-  // return deployedToken;
+  await helper.executeScript(`cd ${playbookRoot} && npm run deployToL2`);
+  // await helper.delay(1500);
+  // await helper.executeScript(`cat ${bufferFile}`);
+  await helper.printLog(`Return to the initial script: deployERC20toL2`);
+  const deployedToken = await helper.getStringFromFile(bufferFile);
+  await helper.printLog(`Before the latest PRINT in global`);
+  await helper.printLog("The custom ERC20 token has been deployed to L2: " + Logger.textSeparator + deployedToken);
+  await helper.printLog(`Before Return in global`);
+  return deployedToken;
 };