Skip to content

simulators/portal: update simulators to use updated hivesim-rs with sim.limit support #1127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KolbyML merged 1 commit into from
Jun 21, 2024
Merged

simulators/portal: update simulators to use updated hivesim-rs with sim.limit support #1127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion simulators/portal/beacon/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"

[dependencies]
ethportal-api = { git = "https://github.com/ethereum/trin", rev = "33ea99da64216899f7ab2778d117a18506d963dd" }
hivesim = { git = "https://github.com/ethereum/portal-hive", rev = "0f830ea8999f2878eb78ef67efc9f80cc888413e" }
hivesim = { git = "https://github.com/ethereum/hive", rev = "62b3362bae655754b5f624c36720ba8c44a2f375" }
futures = "0.3.25"
itertools = "0.10.5"
serde_yaml = "0.9"
Expand Down
17 changes: 1 addition & 16 deletions simulators/portal/beacon/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
mod suites;

use hivesim::{Simulation, Suite, TestSpec};
use hivesim::{run_suite, Simulation, Suite, TestSpec};
use suites::interop::test_portal_interop;
use suites::mesh::test_portal_scenarios;
use suites::rpc_compat::run_rpc_compat_test_suite;
Expand Down Expand Up @@ -60,18 +60,3 @@ async fn main() {
let sim = Simulation::new();
run_suite(sim, vec![beacon_rpc_compat, interop, mesh]).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;
}
}
2 changes: 1 addition & 1 deletion simulators/portal/history/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"
[dependencies]
ethportal-api = { git = "https://github.com/ethereum/trin", rev = "33ea99da64216899f7ab2778d117a18506d963dd" }
portal-spec-test-utils-rs = { git = "https://github.com/ethereum/portal-spec-tests", rev = "954f7d0eb2950a2131048404a1a4ce476bb64657" }
hivesim = { git = "https://github.com/ethereum/portal-hive", rev = "0f830ea8999f2878eb78ef67efc9f80cc888413e" }
hivesim = { git = "https://github.com/ethereum/hive", rev = "62b3362bae655754b5f624c36720ba8c44a2f375" }
futures = "0.3.25"
serde_json = "1.0.87"
tracing = "0.1.37"
Expand Down
17 changes: 1 addition & 16 deletions simulators/portal/history/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pub mod suites;

use hivesim::{Simulation, Suite, TestSpec};
use hivesim::{run_suite, Simulation, Suite, TestSpec};
use suites::interop::test_portal_interop;
use suites::mesh::test_portal_scenarios;
use suites::rpc_compat::run_rpc_compat_test_suite;
Expand Down Expand Up @@ -75,18 +75,3 @@ async fn main() {
let sim = Simulation::new();
run_suite(sim, vec![rpc_compat, interop, mesh, trin_bridge]).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;
}
}
2 changes: 1 addition & 1 deletion simulators/portal/state/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"

[dependencies]
ethportal-api = { git = "https://github.com/ethereum/trin", rev = "33ea99da64216899f7ab2778d117a18506d963dd" }
hivesim = { git = "https://github.com/ethereum/portal-hive", rev = "0f830ea8999f2878eb78ef67efc9f80cc888413e" }
hivesim = { git = "https://github.com/ethereum/hive", rev = "62b3362bae655754b5f624c36720ba8c44a2f375" }
futures = "0.3.25"
itertools = "0.10.5"
serde_json = "1.0.87"
Expand Down
17 changes: 1 addition & 16 deletions simulators/portal/state/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
mod suites;

use hivesim::{Simulation, Suite, TestSpec};
use hivesim::{run_suite, Simulation, Suite, TestSpec};
use suites::interop::test_portal_interop;
use suites::rpc_compat::run_rpc_compat_test_suite;

Expand Down Expand Up @@ -44,18 +44,3 @@ async fn main() {
let sim = Simulation::new();
run_suite(sim, vec![state_rpc_compat, interop]).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;
}
}