From eef4ef83a1bb278686b7ff48ba2a002aa660830d Mon Sep 17 00:00:00 2001
From: Petr Ermishkin <petr@humanode.io>
Date: Thu, 16 Jan 2025 14:49:39 +0300
Subject: [PATCH] =?UTF-8?q?Simplify=20test=20contract=20Deposit=20?=
 =?UTF-8?q?=E2=86=90=20ContractsFactory=20(#1402)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../e2e-tests/ts/lib/abis/contractsFactory.ts | 66 -------------------
 utils/e2e-tests/ts/lib/abis/deposit.ts        | 29 ++++++++
 ... => preserveNonceOnZeroContractBalance.ts} |  2 +-
 3 files changed, 30 insertions(+), 67 deletions(-)
 delete mode 100644 utils/e2e-tests/ts/lib/abis/contractsFactory.ts
 create mode 100644 utils/e2e-tests/ts/lib/abis/deposit.ts
 rename utils/e2e-tests/ts/tests/eth/{contractsFactory.ts => preserveNonceOnZeroContractBalance.ts} (97%)

diff --git a/utils/e2e-tests/ts/lib/abis/contractsFactory.ts b/utils/e2e-tests/ts/lib/abis/contractsFactory.ts
deleted file mode 100644
index c79e29350..000000000
--- a/utils/e2e-tests/ts/lib/abis/contractsFactory.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-// pragma solidity ^0.8.13;
-//
-// contract ContractsFactory {
-//     address private owner;
-//
-//     /**
-//      * Sets contract deployer as owner.
-//      */
-//     constructor() payable {
-//         owner = msg.sender; // 'msg.sender' is sender of current call, contract deployer for a constructor
-//     }
-//
-//     function build()
-//         public
-//         returns (Item itemAddress)
-//     {
-//         return new Item();
-//     }
-//
-//     function withdrawAll() external isOwner {
-//         (bool success,) = owner.call{value:address(this).balance}("");
-//         require(success, "Transfer failed!");
-//     }
-//
-//     /**
-//      * Makes sure if caller is owner.
-//      */
-//     modifier isOwner() {
-//         require(msg.sender == owner, "Caller is not owner");
-//         _;
-//     }
-// }
-//
-// contract Item {}
-
-export default {
-  abi: [
-    {
-      type: "constructor",
-      inputs: [],
-      stateMutability: "payable",
-    },
-    {
-      type: "function",
-      name: "build",
-      inputs: [],
-      outputs: [
-        {
-          name: "itemAddress",
-          type: "address",
-          internalType: "contract Item",
-        },
-      ],
-      stateMutability: "nonpayable",
-    },
-    {
-      type: "function",
-      name: "withdrawAll",
-      inputs: [],
-      outputs: [],
-      stateMutability: "nonpayable",
-    },
-  ],
-  bytecode:
-    "0x60806040525f80546001600160a01b03191633179055610216806100225f395ff3fe608060405234801561000f575f5ffd5b5060043610610034575f3560e01c8063853828b6146100385780638e1a55fc14610042575b5f5ffd5b610040610066565b005b61004a610150565b6040516001600160a01b03909116815260200160405180910390f35b5f546001600160a01b031633146100ba5760405162461bcd60e51b815260206004820152601360248201527221b0b63632b91034b9903737ba1037bbb732b960691b60448201526064015b60405180910390fd5b5f80546040516001600160a01b039091169047908381818185875af1925050503d805f8114610104576040519150601f19603f3d011682016040523d82523d5f602084013e610109565b606091505b505090508061014d5760405162461bcd60e51b815260206004820152601060248201526f5472616e73666572206661696c65642160801b60448201526064016100b1565b50565b5f60405161015d9061017c565b604051809103905ff080158015610176573d5f5f3e3d5ffd5b50905090565b6058806101898339019056fe6080604052348015600e575f5ffd5b50603e80601a5f395ff3fe60806040525f5ffdfea26469706673582212205b805df397effd81fac6da3aaca5e17656240493717a9d8af48b1834ed60974964736f6c634300081c0033a2646970667358221220d09615e692fa242f639400bccc3a539415c571f8d26c76da4c90437f6e7ef43964736f6c634300081c0033",
-} as const;
diff --git a/utils/e2e-tests/ts/lib/abis/deposit.ts b/utils/e2e-tests/ts/lib/abis/deposit.ts
new file mode 100644
index 000000000..aaa2c8c56
--- /dev/null
+++ b/utils/e2e-tests/ts/lib/abis/deposit.ts
@@ -0,0 +1,29 @@
+// pragma solidity ^0.8.13;
+//
+// contract Deposit {
+//     constructor() payable {}
+//
+//     function withdrawAll() external {
+//         (bool success, ) = msg.sender.call{value: address(this).balance}("");
+//         require(success, "Transfer failed!");
+//     }
+// }
+
+export default {
+  abi: [
+    {
+      type: "constructor",
+      inputs: [],
+      stateMutability: "payable",
+    },
+    {
+      type: "function",
+      name: "withdrawAll",
+      inputs: [],
+      outputs: [],
+      stateMutability: "nonpayable",
+    },
+  ],
+  bytecode:
+    "0x608060405260f4806100105f395ff3fe6080604052348015600e575f5ffd5b50600436106026575f3560e01c8063853828b614602a575b5f5ffd5b60306032565b005b6040515f90339047908381818185875af1925050503d805f8114606f576040519150601f19603f3d011682016040523d82523d5f602084013e6074565b606091505b505090508060bb5760405162461bcd60e51b815260206004820152601060248201526f5472616e73666572206661696c65642160801b604482015260640160405180910390fd5b5056fea2646970667358221220ce7ea06cb9a3afb69b76e54771df61ff4f8e2efa0fabbb5f7ca5fb868448768664736f6c634300081c0033",
+} as const;
diff --git a/utils/e2e-tests/ts/tests/eth/contractsFactory.ts b/utils/e2e-tests/ts/tests/eth/preserveNonceOnZeroContractBalance.ts
similarity index 97%
rename from utils/e2e-tests/ts/tests/eth/contractsFactory.ts
rename to utils/e2e-tests/ts/tests/eth/preserveNonceOnZeroContractBalance.ts
index e47b76148..65620d7cd 100644
--- a/utils/e2e-tests/ts/tests/eth/contractsFactory.ts
+++ b/utils/e2e-tests/ts/tests/eth/preserveNonceOnZeroContractBalance.ts
@@ -1,7 +1,7 @@
 import { expect, describe, it } from "vitest";
 import { RunNodeState, runNode } from "../../lib/node";
 import * as eth from "../../lib/ethViem";
-import contractsFactory from "../../lib/abis/contractsFactory";
+import contractsFactory from "../../lib/abis/deposit";
 import "../../lib/expect";
 import { beforeEachWithCleanup } from "../../lib/lifecycle";