simulators/portal: refactor sims into 1 sim multi suite format

Author: KolbyML

simulators/portal/beacon/rpc-compat/Dockerfile renamed to simulators/portal/beacon/Dockerfile

@@ -1,8 +1,8 @@
-FROM rust:1.71.1 AS builder
+FROM rust:1.75.0 AS builder
 
 # create a new empty shell project
-RUN USER=root cargo new --bin rpc-compat
-WORKDIR /rpc-compat
+RUN USER=root cargo new --bin beacon
+WORKDIR /beacon
 
 RUN apt-get update && apt-get install clang -y
 
@@ -19,8 +19,8 @@ FROM ubuntu:22.04
 RUN apt update && apt install wget -y
 
 # copy build artifacts from build stage
-COPY --from=builder /rpc-compat/target/release/rpc-compat .
+COPY --from=builder /beacon/target/release/beacon .
 
 ENV RUST_LOG=debug
 
-ENTRYPOINT ["./rpc-compat"]
+ENTRYPOINT ["./beacon"]

simulators/portal/beacon/rpc-compat/Cargo.toml

@@ -0,0 +1,43 @@
+mod suites;
+
+use hivesim::{Simulation, Suite, TestSpec};
+use suites::rpc_compat::run_rpc_compat_test_suite;
+
+#[tokio::main]
+async fn main() {
+    tracing_subscriber::fmt::init();
+    let mut beacon_rpc_compat = Suite {
+        name: "beacon-rpc-compat".to_string(),
+        description: "The RPC-compatibility test suite runs a set of RPC related tests against a
+        running node. It tests client implementations of the JSON-RPC API for
+        conformance with the portal network API specification."
+            .to_string(),
+        tests: vec![],
+    };
+
+    beacon_rpc_compat.add(TestSpec {
+        name: "client launch".to_string(),
+        description: "This test launches the client and collects its logs.".to_string(),
+        always_run: false,
+        run: run_rpc_compat_test_suite,
+        client: None,
+    });
+
+    let sim = Simulation::new();
+    run_suite(sim, vec![beacon_rpc_compat]).await;
+}
+
+async fn run_suite(host: Simulation, suites: Vec<Suite>) {
+    for suite in suites {
+        let name = suite.clone().name;
+        let description = suite.clone().description;
+
+        let suite_id = host.start_suite(name, description, "".to_string()).await;
+
+        for test in &suite.tests {
+            test.run_test(host.clone(), suite_id, suite.clone()).await;
+        }
+
+        host.end_suite(suite_id).await;
+    }
+}

simulators/portal/beacon/src/main.rs

@@ -1,2 +1,5 @@
 pub const HIVE_PORTAL_NETWORKS_SELECTED: &str = "HIVE_PORTAL_NETWORKS_SELECTED";
 pub const BEACON_STRING: &str = "beacon";
+
+// trin-bridge constants
+pub const TRIN_BRIDGE_CLIENT_TYPE: &str = "trin-bridge";

simulators/portal/beacon/rpc-compat/src/constants.rs renamed to simulators/portal/beacon/src/suites/constants.rs

@@ -0,0 +1,2 @@
+pub mod constants;
+pub mod rpc_compat;

simulators/portal/beacon/src/suites/mod.rs

@@ -1,8 +1,8 @@
-FROM rust:1.71.1 AS builder
+FROM rust:1.75.0 AS builder
 
 # create a new empty shell project
-RUN USER=root cargo new --bin portal-interop
-WORKDIR /portal-interop
+RUN USER=root cargo new --bin history
+WORKDIR /history
 
 # copy over manifests and source to build image
 COPY Cargo.toml ./Cargo.toml
@@ -17,9 +17,9 @@ FROM ubuntu:22.04
 RUN apt update && apt install wget -y
 
 # copy build artifacts from build stage
-COPY --from=builder /portal-interop/target/release/portal-interop .
+COPY --from=builder /history/target/release/history .
 ADD https://raw.githubusercontent.com/ethereum/portal-spec-tests/master/tests/mainnet/history/hive/test_data_collection_of_forks_blocks.yaml ./test-data/test_data_collection_of_forks_blocks.yaml
 
 ENV RUST_LOG=debug
 
-ENTRYPOINT ["./portal-interop"]
+ENTRYPOINT ["./history"]