Merge branch 'main' into yarkin/support_arm

eosnetworkfoundation · Feb 29, 2024 · cff5608 · cff5608
2 parents 4b78a42 + f2a5f48
commit cff5608
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 172 deletions.
diff --git a/.cicd/defaults.json b/.cicd/defaults.json
@@ -1,10 +1,10 @@
 {
    "leap-dev":{
-      "target":"4",
+      "target":"5",
       "prerelease":false
    },
    "leap":{
-      "target":"4",
+      "target":"5",
       "prerelease":false
    },
    "cdt":{

diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
@@ -62,7 +62,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           submodules: 'false'
@@ -131,7 +131,7 @@ jobs:
           private_key: ${{ secrets.TRUSTEVM_CI_APP_KEY }}
 
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: 'recursive'
@@ -250,8 +250,9 @@ jobs:
           repo: leap
           target: '${{needs.versions.outputs.leap-dev-target}}'
           prereleases: ${{fromJSON(needs.versions.outputs.leap-dev-prerelease)}}
-          file: 'leap-dev.*(x86_64|amd64).deb'
+          file: 'leap-dev.*ubuntu22\.04_amd64.deb'
           container-package: experimental-binaries
+          artifact-name: leap-dev-ubuntu22-amd64
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Download leap binary
@@ -261,7 +262,8 @@ jobs:
           repo: leap
           target: '${{needs.versions.outputs.leap-target}}'
           prereleases: ${{fromJSON(needs.versions.outputs.leap-prerelease)}}
-          file: 'leap.*${{matrix.platform}}.*(x86_64|amd64).deb'
+          file: 'leap_.*_amd64.deb'
+          artifact-name: leap-deb-amd64
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install Leap
@@ -300,7 +302,7 @@ jobs:
           private_key: ${{ secrets.TRUSTEVM_CI_APP_KEY }}
 
       - name: Checkout eos-evm-miner
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: eosnetworkfoundation/eos-evm-miner
           path: eos-evm-miner

diff --git a/tests/nodeos_eos_evm_server.py b/tests/nodeos_eos_evm_server.py
@@ -20,7 +20,7 @@
 sys.path.append(os.getcwd())
 sys.path.append(os.path.join(os.getcwd(), "tests"))
 
-from TestHarness import Cluster, TestHelper, Utils, WalletMgr
+from TestHarness import Cluster, TestHelper, Utils, WalletMgr, createAccountKeys
 from TestHarness.TestHelper import AppArgs
 from TestHarness.testUtils import ReturnType
 from TestHarness.core_symbol import CORE_SYMBOL
@@ -70,12 +70,11 @@
 appArgs.add(flag="--read-endpoint", type=str, help="EVM read endpoint (eos-evm-rpc)", default="http://localhost:8881")
 appArgs.add(flag="--use-eos-vm-oc", type=bool, help="EOS EVM Contract build dir", default=False)
 
-args=TestHelper.parse_args({"--keep-logs","--dump-error-details","-v","--leave-running","--clean-run" }, applicationSpecificArgs=appArgs)
+args=TestHelper.parse_args({"--keep-logs","--dump-error-details","-v","--leave-running" }, applicationSpecificArgs=appArgs)
 debug=args.v
 killEosInstances= not args.leave_running
 dumpErrorDetails=args.dump_error_details
 keepLogs=args.keep_logs
-killAll=args.clean_run
 eosEvmContractRoot=args.eos_evm_contract_root
 eosEvmBridgeContractsRoot=args.eos_evm_bridge_contracts_root
 gensisJson=args.genesis_json
@@ -94,18 +93,14 @@
 testSuccessful=False
 
 random.seed(seed) # Use a fixed seed for repeatability.
-cluster=Cluster(walletd=True)
+cluster=Cluster(keepRunning=args.leave_running, keepLogs=args.keep_logs)
 walletMgr=WalletMgr(True)
 
 
 try:
     TestHelper.printSystemInfo("BEGIN")
 
     cluster.setWalletMgr(walletMgr)
-    cluster.killall(allInstances=killAll)
-    cluster.cleanup()
-    walletMgr.killall(allInstances=killAll)
-    walletMgr.cleanup()
 
     # ***   setup topogrophy   ***
 
@@ -146,7 +141,7 @@
     if eosEvmBridgeContractsRoot:
         total_accounts_to_create += 3
 
-    accounts=cluster.createAccountKeys(total_accounts_to_create)
+    accounts=createAccountKeys(total_accounts_to_create)
     if accounts is None:
         Utils.errorExit("FAILURE - create keys")
 
@@ -497,7 +492,7 @@ def forward_request(req):
     app.run(host='0.0.0.0', port=5000)
 
 finally:
-    TestHelper.shutdown(cluster, walletMgr, testSuccessful=testSuccessful, killEosInstances=killEosInstances, killWallet=killEosInstances, keepLogs=keepLogs, cleanRun=killAll, dumpErrorDetails=dumpErrorDetails)
+    TestHelper.shutdown(cluster, walletMgr, testSuccessful=testSuccessful, dumpErrorDetails=dumpErrorDetails)
 
 exitCode = 0 if testSuccessful else 1
 exit(exitCode)