move tests from evm_loader folder (#207)

* move tests from evm_loader folder * chmod
neonlabsorg · Oct 18, 2023 · d6ee3a7 · d6ee3a7
1 parent ed1f97b
commit d6ee3a7
Show file tree

Hide file tree

Showing 78 changed files with 187 additions and 187 deletions.
diff --git a/.github/workflows/deploy.py b/.github/workflows/deploy.py
@@ -105,7 +105,7 @@ def run_tests(github_sha):
     project_name = f"neon-evm-{github_sha}"
     stop_containers(project_name)
 
-    run_subprocess(f"docker-compose -p {project_name} -f ./evm_loader/docker-compose-ci.yml up -d")
+    run_subprocess(f"docker-compose -p {project_name} -f ./ci/docker-compose-ci.yml up -d")
     container_name = get_solana_container_name(project_name)
     click.echo("Start tests")
     exec_id = docker_client.exec_create(
@@ -127,7 +127,7 @@ def run_tests(github_sha):
 
     exec_status = docker_client.exec_inspect(exec_id['Id'])["ExitCode"]
 
-    run_subprocess(f"docker-compose -p {project_name} -f ./evm_loader/docker-compose-ci.yml logs dk-neon-api")
+    run_subprocess(f"docker-compose -p {project_name} -f ./ci/docker-compose-ci.yml logs dk-neon-api")
 
     stop_containers(project_name)
 
@@ -137,7 +137,7 @@ def run_tests(github_sha):
 
 def get_solana_container_name(project_name):
     data = subprocess.run(
-        f"docker-compose -p {project_name} -f ./evm_loader/docker-compose-ci.yml ps",
+        f"docker-compose -p {project_name} -f ./ci/docker-compose-ci.yml ps",
         shell=True, capture_output=True, text=True).stdout
     click.echo(data)
     pattern = rf'{project_name}_solana_[1-9]+'
@@ -147,7 +147,7 @@ def get_solana_container_name(project_name):
 
 
 def stop_containers(project_name):
-    run_subprocess(f"docker-compose -p {project_name} -f ./evm_loader/docker-compose-ci.yml down")
+    run_subprocess(f"docker-compose -p {project_name} -f ./ci/docker-compose-ci.yml down")
 
 
 @cli.command(name="trigger_proxy_action")

diff --git a/Dockerfile b/Dockerfile
@@ -32,8 +32,8 @@ FROM ubuntu:20.04 AS contracts
 RUN apt-get update && \
     DEBIAN_FRONTEND=nontineractive apt-get -y install xxd && \
     rm -rf /var/lib/apt/lists/* /var/lib/apt/cache/*
-COPY evm_loader/tests/contracts/*.sol /opt/
-COPY evm_loader/solidity/*.sol /opt/
+COPY tests/contracts/*.sol /opt/
+COPY solidity/*.sol /opt/
 #COPY evm_loader/tests/test_solidity_precompiles.json /opt/
 COPY --from=solc /usr/bin/solc /usr/bin/solc
 WORKDIR /opt/
@@ -51,10 +51,10 @@ RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install vim less openssl ca-certificates curl python3 python3-pip parallel && \
     rm -rf /var/lib/apt/lists/*
 
-COPY evm_loader/tests/requirements.txt /tmp/
+COPY tests/requirements.txt /tmp/
 RUN pip3 install -r /tmp/requirements.txt
 
-COPY /evm_loader/solidity/ /opt/contracts/contracts/
+#COPY /evm_loader/solidity/ /opt/contracts/contracts/
 WORKDIR /opt
 
 COPY --from=solana \
@@ -80,19 +80,19 @@ COPY --from=evm-loader-builder /opt/neon-evm/evm_loader/target/release/neon-api
 COPY --from=solana /usr/bin/spl-token /opt/spl-token
 COPY --from=contracts /opt/ /opt/solidity/
 COPY --from=contracts /usr/bin/solc /usr/bin/solc
-COPY evm_loader/wait-for-solana.sh \
-    evm_loader/wait-for-neon.sh \
-    evm_loader/deploy-evm.sh \
-    evm_loader/deploy-test.sh \
-    evm_loader/create-test-accounts.sh \
-    evm_loader/evm_loader-keypair.json \
+COPY ci/wait-for-solana.sh \
+    ci/wait-for-neon.sh \
+    ci/deploy-evm.sh \
+    ci/deploy-test.sh \
+    ci/create-test-accounts.sh \
+    ci/evm_loader-keypair.json \
     /opt/
 
-COPY evm_loader/operator-keypairs/ /opt/operator-keypairs
-COPY evm_loader/tests /opt/tests
-COPY evm_loader/operator-keypairs/id.json /root/.config/solana/id.json
-COPY evm_loader/operator-keypairs/id2.json /root/.config/solana/id2.json
-COPY evm_loader/keys/ /opt/keys
+COPY ci/operator-keypairs/ /opt/operator-keypairs
+COPY tests /opt/tests
+COPY ci/operator-keypairs/id.json /root/.config/solana/id.json
+COPY ci/operator-keypairs/id2.json /root/.config/solana/id2.json
+COPY ci/keys/ /opt/keys
 
-ENV CONTRACTS_DIR=/opt/solidity/
+#ENV CONTRACTS_DIR=/opt/solidity/
 ENV PATH=/opt/solana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt
diff --git a/evm_loader/create-test-accounts.sh → ci/create-test-accounts.sh b/evm_loader/create-test-accounts.sh → ci/create-test-accounts.sh
diff --git a/evm_loader/deploy-evm.sh → ci/deploy-evm.sh b/evm_loader/deploy-evm.sh → ci/deploy-evm.sh
diff --git a/evm_loader/deploy-test.sh → ci/deploy-test.sh b/evm_loader/deploy-test.sh → ci/deploy-test.sh
diff --git a/evm_loader/docker-compose-ci.yml → ci/docker-compose-ci.yml b/evm_loader/docker-compose-ci.yml → ci/docker-compose-ci.yml
diff --git a/evm_loader/docker-compose-test.yml → ci/docker-compose-test.yml b/evm_loader/docker-compose-test.yml → ci/docker-compose-test.yml
diff --git a/evm_loader/evm_loader-keypair.json → ci/evm_loader-keypair.json b/evm_loader/evm_loader-keypair.json → ci/evm_loader-keypair.json
diff --git a/evm_loader/keys/neon_token_keypair.json → ci/keys/neon_token_keypair.json b/evm_loader/keys/neon_token_keypair.json → ci/keys/neon_token_keypair.json
diff --git a/evm_loader/operator-keypairs/id.json → ci/operator-keypairs/id.json b/evm_loader/operator-keypairs/id.json → ci/operator-keypairs/id.json
diff --git a/evm_loader/operator-keypairs/id10.json → ci/operator-keypairs/id10.json b/evm_loader/operator-keypairs/id10.json → ci/operator-keypairs/id10.json
diff --git a/evm_loader/operator-keypairs/id11.json → ci/operator-keypairs/id11.json b/evm_loader/operator-keypairs/id11.json → ci/operator-keypairs/id11.json
diff --git a/evm_loader/operator-keypairs/id12.json → ci/operator-keypairs/id12.json b/evm_loader/operator-keypairs/id12.json → ci/operator-keypairs/id12.json
diff --git a/evm_loader/operator-keypairs/id13.json → ci/operator-keypairs/id13.json b/evm_loader/operator-keypairs/id13.json → ci/operator-keypairs/id13.json
diff --git a/evm_loader/operator-keypairs/id14.json → ci/operator-keypairs/id14.json b/evm_loader/operator-keypairs/id14.json → ci/operator-keypairs/id14.json
diff --git a/evm_loader/operator-keypairs/id15.json → ci/operator-keypairs/id15.json b/evm_loader/operator-keypairs/id15.json → ci/operator-keypairs/id15.json
diff --git a/evm_loader/operator-keypairs/id16.json → ci/operator-keypairs/id16.json b/evm_loader/operator-keypairs/id16.json → ci/operator-keypairs/id16.json
diff --git a/evm_loader/operator-keypairs/id17.json → ci/operator-keypairs/id17.json b/evm_loader/operator-keypairs/id17.json → ci/operator-keypairs/id17.json
diff --git a/evm_loader/operator-keypairs/id18.json → ci/operator-keypairs/id18.json b/evm_loader/operator-keypairs/id18.json → ci/operator-keypairs/id18.json
diff --git a/evm_loader/operator-keypairs/id19.json → ci/operator-keypairs/id19.json b/evm_loader/operator-keypairs/id19.json → ci/operator-keypairs/id19.json
diff --git a/evm_loader/operator-keypairs/id2.json → ci/operator-keypairs/id2.json b/evm_loader/operator-keypairs/id2.json → ci/operator-keypairs/id2.json
diff --git a/evm_loader/operator-keypairs/id20.json → ci/operator-keypairs/id20.json b/evm_loader/operator-keypairs/id20.json → ci/operator-keypairs/id20.json
diff --git a/evm_loader/operator-keypairs/id21.json → ci/operator-keypairs/id21.json b/evm_loader/operator-keypairs/id21.json → ci/operator-keypairs/id21.json
diff --git a/evm_loader/operator-keypairs/id22.json → ci/operator-keypairs/id22.json b/evm_loader/operator-keypairs/id22.json → ci/operator-keypairs/id22.json
diff --git a/evm_loader/operator-keypairs/id23.json → ci/operator-keypairs/id23.json b/evm_loader/operator-keypairs/id23.json → ci/operator-keypairs/id23.json
diff --git a/evm_loader/operator-keypairs/id24.json → ci/operator-keypairs/id24.json b/evm_loader/operator-keypairs/id24.json → ci/operator-keypairs/id24.json
diff --git a/evm_loader/operator-keypairs/id25.json → ci/operator-keypairs/id25.json b/evm_loader/operator-keypairs/id25.json → ci/operator-keypairs/id25.json
diff --git a/evm_loader/operator-keypairs/id26.json → ci/operator-keypairs/id26.json b/evm_loader/operator-keypairs/id26.json → ci/operator-keypairs/id26.json
diff --git a/evm_loader/operator-keypairs/id27.json → ci/operator-keypairs/id27.json b/evm_loader/operator-keypairs/id27.json → ci/operator-keypairs/id27.json
diff --git a/evm_loader/operator-keypairs/id28.json → ci/operator-keypairs/id28.json b/evm_loader/operator-keypairs/id28.json → ci/operator-keypairs/id28.json
diff --git a/evm_loader/operator-keypairs/id29.json → ci/operator-keypairs/id29.json b/evm_loader/operator-keypairs/id29.json → ci/operator-keypairs/id29.json
diff --git a/evm_loader/operator-keypairs/id3.json → ci/operator-keypairs/id3.json b/evm_loader/operator-keypairs/id3.json → ci/operator-keypairs/id3.json
diff --git a/evm_loader/operator-keypairs/id30.json → ci/operator-keypairs/id30.json b/evm_loader/operator-keypairs/id30.json → ci/operator-keypairs/id30.json
diff --git a/evm_loader/operator-keypairs/id4.json → ci/operator-keypairs/id4.json b/evm_loader/operator-keypairs/id4.json → ci/operator-keypairs/id4.json
diff --git a/evm_loader/operator-keypairs/id5.json → ci/operator-keypairs/id5.json b/evm_loader/operator-keypairs/id5.json → ci/operator-keypairs/id5.json
diff --git a/evm_loader/operator-keypairs/id6.json → ci/operator-keypairs/id6.json b/evm_loader/operator-keypairs/id6.json → ci/operator-keypairs/id6.json
diff --git a/evm_loader/operator-keypairs/id7.json → ci/operator-keypairs/id7.json b/evm_loader/operator-keypairs/id7.json → ci/operator-keypairs/id7.json
diff --git a/evm_loader/operator-keypairs/id8.json → ci/operator-keypairs/id8.json b/evm_loader/operator-keypairs/id8.json → ci/operator-keypairs/id8.json
diff --git a/evm_loader/operator-keypairs/id9.json → ci/operator-keypairs/id9.json b/evm_loader/operator-keypairs/id9.json → ci/operator-keypairs/id9.json
diff --git a/evm_loader/wait-for-neon.sh → ci/wait-for-neon.sh b/evm_loader/wait-for-neon.sh → ci/wait-for-neon.sh
diff --git a/evm_loader/wait-for-solana.sh → ci/wait-for-solana.sh b/evm_loader/wait-for-solana.sh → ci/wait-for-solana.sh
diff --git a/evm_loader/solidity/Metaplex.sol → solidity/Metaplex.sol b/evm_loader/solidity/Metaplex.sol → solidity/Metaplex.sol
diff --git a/evm_loader/solidity/SPLToken.sol → solidity/SPLToken.sol b/evm_loader/solidity/SPLToken.sol → solidity/SPLToken.sol
diff --git a/evm_loader/solidity/big_contract.sol → solidity/big_contract.sol b/evm_loader/solidity/big_contract.sol → solidity/big_contract.sol
diff --git a/evm_loader/solidity/erc20_for_spl.sol → solidity/erc20_for_spl.sol b/evm_loader/solidity/erc20_for_spl.sol → solidity/erc20_for_spl.sol
diff --git a/...loader/solidity/erc20_for_spl_factory.sol → solidity/erc20_for_spl_factory.sol b/...loader/solidity/erc20_for_spl_factory.sol → solidity/erc20_for_spl_factory.sol
diff --git a/evm_loader/solidity/erc721_for_metaplex.sol → solidity/erc721_for_metaplex.sol b/evm_loader/solidity/erc721_for_metaplex.sol → solidity/erc721_for_metaplex.sol
diff --git a/evm_loader/solidity/lib_query_account.sol → solidity/lib_query_account.sol b/evm_loader/solidity/lib_query_account.sol → solidity/lib_query_account.sol
diff --git a/evm_loader/solidity/neon_wrapper.sol → solidity/neon_wrapper.sol b/evm_loader/solidity/neon_wrapper.sol → solidity/neon_wrapper.sol
diff --git a/evm_loader/tests/.gitignore → tests/.gitignore b/evm_loader/tests/.gitignore → tests/.gitignore
diff --git a/evm_loader/tests/README.md → tests/README.md b/evm_loader/tests/README.md → tests/README.md
diff --git a/evm_loader/tests/__init__.py → tests/__init__.py b/evm_loader/tests/__init__.py → tests/__init__.py