refactor: move crate utp-testing to testing/utp

ethereum · Jan 14, 2025 · 38f2bf4 · 38f2bf4
1 parent 80ddc06
commit 38f2bf4
Show file tree

Hide file tree

Showing 15 changed files with 5 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -284,14 +284,14 @@ jobs:
           command: cargo build --workspace --release
       - run:
           name: Move docker artifacts
-          command: mv -t utp-testing/docker/circleci/ target/release/utp-test-app utp-testing/docker/run_endpoint.sh utp-testing/docker/setup.sh
+          command: mv -t testing/utp/docker/circleci/ target/release/utp-test-app testing/utp/docker/run_endpoint.sh testing/utp/docker/setup.sh
       - run:
           name: Build uTP Test App container
-          command: docker build -t test-utp --no-cache utp-testing/docker/circleci/
+          command: docker build -t test-utp --no-cache testing/utp/docker/circleci/
       - run:
           name: Run Test App with network simulator
           # Dropping packets from both sides of the stream to test dealing with lost packets
-          command: SCENARIO="droplist --delay=15ms --bandwidth=10Mbps --queue=25 --drops_to_server=3,5,7 --drops_to_client=6,8" docker-compose -f utp-testing/docker/docker-compose.yml up -d
+          command: SCENARIO="droplist --delay=15ms --bandwidth=10Mbps --queue=25 --drops_to_server=3,5,7 --drops_to_client=6,8" docker-compose -f testing/utp/docker/docker-compose.yml up -d
       - run:
           name: Wait all containers to start
           command: sleep 5
@@ -303,7 +303,7 @@ jobs:
           command: RUST_LOG=debug ./target/release/utp-test-suite
       - run:
           name: Stop containers
-          command: docker-compose -f utp-testing/docker/docker-compose.yml down
+          command: docker-compose -f testing/utp/docker/docker-compose.yml down
 workflows:
   merge-test:
     jobs:

diff --git a/.dockerignore b/.dockerignore
@@ -9,7 +9,6 @@
 !/portal-bridge
 !/testing
 !/trin-execution
-!/utp-testing
 
 # include for vergen constants
 !/.git

diff --git a/Cargo.toml b/Cargo.toml
@@ -16,8 +16,8 @@ members = [
     "portal-bridge",
     "testing/ef-tests",
     "testing/ethportal-peertest",
+    "testing/utp",
     "trin-execution",
-    "utp-testing",
 ]
 
 default-members = ["bin/trin"]

diff --git a/utp-testing/Cargo.toml → testing/utp/Cargo.toml b/utp-testing/Cargo.toml → testing/utp/Cargo.toml
diff --git a/utp-testing/README.md → testing/utp/README.md b/utp-testing/README.md → testing/utp/README.md
diff --git a/utp-testing/docker/Dockerfile → testing/utp/docker/Dockerfile b/utp-testing/docker/Dockerfile → testing/utp/docker/Dockerfile
diff --git a/utp-testing/docker/circleci/Dockerfile → testing/utp/docker/circleci/Dockerfile b/utp-testing/docker/circleci/Dockerfile → testing/utp/docker/circleci/Dockerfile
diff --git a/utp-testing/docker/docker-compose.yml → testing/utp/docker/docker-compose.yml b/utp-testing/docker/docker-compose.yml → testing/utp/docker/docker-compose.yml
diff --git a/utp-testing/docker/run_endpoint.sh → testing/utp/docker/run_endpoint.sh b/utp-testing/docker/run_endpoint.sh → testing/utp/docker/run_endpoint.sh
diff --git a/utp-testing/docker/setup.sh → testing/utp/docker/setup.sh b/utp-testing/docker/setup.sh → testing/utp/docker/setup.sh
diff --git a/utp-testing/src/bin/test_app.rs → testing/utp/src/bin/test_app.rs b/utp-testing/src/bin/test_app.rs → testing/utp/src/bin/test_app.rs
diff --git a/utp-testing/src/bin/test_suite.rs → testing/utp/src/bin/test_suite.rs b/utp-testing/src/bin/test_suite.rs → testing/utp/src/bin/test_suite.rs
diff --git a/utp-testing/src/cli.rs → testing/utp/src/cli.rs b/utp-testing/src/cli.rs → testing/utp/src/cli.rs
diff --git a/utp-testing/src/lib.rs → testing/utp/src/lib.rs b/utp-testing/src/lib.rs → testing/utp/src/lib.rs
diff --git a/utp-testing/src/rpc.rs → testing/utp/src/rpc.rs b/utp-testing/src/rpc.rs → testing/utp/src/rpc.rs