Move e2e tests from a dedicated crate to tests/ at the workspace root

.github/workflows/pr-test-cargo-e2e.yaml

@@ -0,0 +1,28 @@
+name: Run end-to-end tests
+on:
+  pull_request:
+    types: [labeled, unlabeled, opened, reopened, synchronize]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  if: false
+  test-cargo:
+    runs-on: [self-hosted, general]
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Build testsuite
+        uses: ./.github/actions/cargo-command
+        with:
+          command: test
+          args: --all-features --no-run
+      - name: Run testsuite
+        uses: ./.github/actions/cargo-command
+        with:
+          command: test
+          args: --all-features -p timechain --tests
+          cache: false
+          annotate: false

.github/workflows/pr-test-cargo.yaml

@@ -1,4 +1,4 @@
-name: Check testsuite
+name: Run all except e2e tests
 on:
   pull_request:
     paths:
@@ -38,6 +38,6 @@ jobs:
         uses: ./.github/actions/cargo-command
         with:
           command: test
-          args: --all-features --lib --bins
+          args: --all-features --exclude timechain
           cache: false
           annotate: false

.github/workflows/pr-test-compose.yaml

@@ -1,5 +1,5 @@
 # Triggered via !ci-test-basic tag
-name: Check basic integration
+name: Run tc-cli smoke test
 on:
   pull_request:
     types: [labeled, unlabeled, opened, reopened, synchronize]

Cargo.toml

@@ -36,7 +36,6 @@ members = [
 	"tc-subxt/metadata",
 	"tss",
 	"utils/generate-bags",
-	"e2e-tests",
 ]
 default-members = [
   "chronicle",
@@ -106,6 +105,27 @@ eth-bridge-runtime-api = { path = "pallets/eth-bridge/runtime-api", default-feat
 eth-bridge = { path = "pallets/eth-bridge", default-features = false }
 bridge-multisig = { path = "pallets/bridge-multisig", default-features = false }
 
+[package]
+name = "timechain"
+authors.workspace = true
+edition.workspace = true
+version.workspace = true
+homepage.workspace = true
+license.workspace = true
+readme.workspace = true
+repository.workspace = true
+
+[dev-dependencies]
+tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
+anyhow.workspace = true
+futures.workspace = true
+time-primitives = { workspace = true, features = ["testnet", "develop"] }
+tc-cli= { path = "tc-cli", features = ["testnet", "develop"] }
+tracing.workspace = true
+tracing-subscriber.workspace = true
+hex.workspace = true
+
+
 [profile.release]
 # Runtime requires unwinding.
 panic = "unwind"

docker-compose.yml

@@ -99,8 +99,6 @@ services:
     environment:
       RUST_LOG: 'tc_subxt=debug,chronicle=debug,tss=debug,gmp_evm=info'
       RUST_BACKTRACE: 1
-    ports:
-    - 8080:8080
     profiles:
     - evm
     - bridge
@@ -128,8 +126,6 @@ services:
     environment:
       RUST_LOG: 'tc_subxt=debug,chronicle=debug,tss=debug,gmp_evm=info'
       RUST_BACKTRACE: 1
-    ports:
-    - 8081:8080
     profiles:
     - evm
 

gmp/evm/src/lib.rs

@@ -594,7 +594,7 @@ impl IConnectorAdmin for Connector {
 			self.backend.get_code(proxy_addr.0 .0.into(), AtBlock::Latest).await?;
 		if !is_proxy_deployed.is_empty() {
 			tracing::debug!("Proxy already deployed, Please upgrade the gateway contract");
-			return Ok((t_addr(proxy_addr.into()), 0));
+			return Ok((t_addr(proxy_addr), 0));
 		}
 
 		// gateway deployment
@@ -618,7 +618,7 @@ impl IConnectorAdmin for Connector {
 		let gateway = extract_bytecode(gateway)?;
 
 		let gateway_addr =
-			self.deploy_gateway_contract(&config, a_addr(proxy).into(), gateway).await?;
+			self.deploy_gateway_contract(&config, a_addr(proxy), gateway).await?;
 		let call = sol::Gateway::upgradeCall {
 			newImplementation: gateway_addr,
 		};

e2e-tests/tests/common.rs → tests/common.rs

@@ -9,7 +9,7 @@ pub struct TestEnv {
 }
 
 const CONFIG: &str = "local-evm-e2e.yaml";
-const ENV: &str = "../config/envs/local";
+const ENV: &str = "config/envs/local";
 
 impl TestEnv {
 	async fn new() -> Result<Self> {
@@ -56,7 +56,7 @@ impl Drop for TestEnv {
 }
 
 fn build_containers() -> Result<bool> {
-	let mut cmd = process::Command::new(Path::new("../scripts/build_docker.sh"));
+	let mut cmd = process::Command::new(Path::new("scripts/build_docker.sh"));
 	let mut child = cmd.spawn().context("Error building containers")?;
 
 	child.wait().map(|c| c.success()).context("Error building containers: {e}")