From 426bfc3d1bf96f93e5b5cd0fec0e4e12d9a16a00 Mon Sep 17 00:00:00 2001 From: Kolby Moroz Liebl <31669092+KolbyML@users.noreply.github.com> Date: Thu, 1 Feb 2024 16:04:45 -0700 Subject: [PATCH 1/2] simulators/portal/history/portal-interop: add portal network history portal-interop simulator --- .gitignore | 4 + .../portal/history/portal-interop/Cargo.toml | 16 + .../portal/history/portal-interop/Dockerfile | 25 + .../history/portal-interop/src/constants.rs | 1 + .../portal/history/portal-interop/src/main.rs | 699 ++++++++++++++++++ 5 files changed, 745 insertions(+) create mode 100644 simulators/portal/history/portal-interop/Cargo.toml create mode 100644 simulators/portal/history/portal-interop/Dockerfile create mode 100644 simulators/portal/history/portal-interop/src/constants.rs create mode 100644 simulators/portal/history/portal-interop/src/main.rs diff --git a/.gitignore b/.gitignore index 71fa6671ee..eead5cce5d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,7 @@ workspace .idea/ # build output /hive + +# build output for rust simulators files +simulators/**/Cargo.lock +simulators/**/target diff --git a/simulators/portal/history/portal-interop/Cargo.toml b/simulators/portal/history/portal-interop/Cargo.toml new file mode 100644 index 0000000000..cfcb9d33f3 --- /dev/null +++ b/simulators/portal/history/portal-interop/Cargo.toml @@ -0,0 +1,16 @@ +[package] +name = "portal-interop" +version = "0.1.0" +authors = ["Ognyan Genev ", "Kolby ML (Moroz Liebl) "] +edition = "2021" + +[dependencies] +ethportal-api = { git = "https://github.com/ethereum/trin", rev = "2a32224e3c2b0b80bc37c1b692c33016371f197a" } +portal-spec-test-utils-rs = { git = "https://github.com/ethereum/portal-spec-tests", rev = "d1e996d0d4dc2136b3cd38d9e25cdc3a6b74dcd9" } +hivesim = { git = "https://github.com/ethereum/portal-hive", rev = "8ff1e3d3c941dd00d56dacd777a5dfb71edf402f" } +itertools = "0.10.5" +serde_json = "1.0.87" +serde_yaml = "0.9" +tokio = { version = "1", features = ["full"] } +tracing = "0.1.37" +tracing-subscriber = "0.3.16" diff --git a/simulators/portal/history/portal-interop/Dockerfile b/simulators/portal/history/portal-interop/Dockerfile new file mode 100644 index 0000000000..fcdb96f856 --- /dev/null +++ b/simulators/portal/history/portal-interop/Dockerfile @@ -0,0 +1,25 @@ +FROM rust:1.71.1 AS builder + +# create a new empty shell project +RUN USER=root cargo new --bin portal-interop +WORKDIR /portal-interop + +# copy over manifests and source to build image +COPY Cargo.toml ./Cargo.toml +COPY src ./src + +# build for release +RUN cargo build --release + +# final base +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 . +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"] diff --git a/simulators/portal/history/portal-interop/src/constants.rs b/simulators/portal/history/portal-interop/src/constants.rs new file mode 100644 index 0000000000..f04015433e --- /dev/null +++ b/simulators/portal/history/portal-interop/src/constants.rs @@ -0,0 +1 @@ +pub const TEST_DATA_FILE_PATH: &str = "./test-data/test_data_collection_of_forks_blocks.yaml"; diff --git a/simulators/portal/history/portal-interop/src/main.rs b/simulators/portal/history/portal-interop/src/main.rs new file mode 100644 index 0000000000..4d60d1ac9b --- /dev/null +++ b/simulators/portal/history/portal-interop/src/main.rs @@ -0,0 +1,699 @@ +mod constants; + +use crate::constants::TEST_DATA_FILE_PATH; +use ethportal_api::types::portal::ContentInfo; +use ethportal_api::utils::bytes::hex_encode; +use ethportal_api::{ + ContentValue, Discv5ApiClient, HistoryContentKey, HistoryContentValue, HistoryNetworkApiClient, + OverlayContentKey, PossibleHistoryContentValue, +}; +use hivesim::{dyn_async, Client, NClientTestSpec, Simulation, Suite, Test, TestSpec}; +use itertools::Itertools; +use portal_spec_test_utils_rs::get_flair; +use serde_json::json; +use serde_yaml::Value; +use tokio::time::Duration; + +// This is taken from Trin. It should be fairly standard +const MAX_PORTAL_CONTENT_PAYLOAD_SIZE: usize = 1165; + +// Header with proof for block number 14764013 +const HEADER_WITH_PROOF_KEY: &str = + "0x00720704f3aa11c53cf344ea069db95cecb81ad7453c8f276b2a1062979611f09c"; + +#[tokio::main] +async fn main() { + tracing_subscriber::fmt::init(); + + let mut suite = Suite { + name: "portal-interop".to_string(), + description: + "The portal interop test suite runs a set of scenarios to test interoperability between + portal network clients" + .to_string(), + tests: vec![], + }; + + suite.add(TestSpec { + name: "Portal Network interop".to_string(), + description: "".to_string(), + always_run: false, + run: test_portal_interop, + client: None, + }); + + let sim = Simulation::new(); + run_suite(sim, suite).await; +} + +async fn run_suite(host: Simulation, suite: Suite) { + 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; +} + +fn content_pair_to_string_pair( + content_pair: (HistoryContentKey, HistoryContentValue), +) -> (String, String) { + let (content_key, content_value) = content_pair; + (content_key.to_hex(), hex_encode(content_value.encode())) +} + +/// Processed content data for history tests +struct ProcessedContent { + content_type: String, + block_number: u64, + test_data: Vec<(String, String)>, +} + +fn process_content( + content: Vec<(HistoryContentKey, HistoryContentValue)>, +) -> Vec { + let mut last_header = content.first().unwrap().clone(); + + let mut result: Vec = vec![]; + for history_content in content.into_iter() { + if let HistoryContentKey::BlockHeaderWithProof(_) = &history_content.0 { + last_header = history_content.clone(); + } + let (content_type, block_number, test_data) = + if let HistoryContentValue::BlockHeaderWithProof(header_with_proof) = &last_header.1 { + match &history_content.0 { + HistoryContentKey::BlockHeaderWithProof(_) => ( + "Block Header".to_string(), + header_with_proof.header.number, + vec![content_pair_to_string_pair(last_header.clone())], + ), + HistoryContentKey::BlockBody(_) => ( + "Block Body".to_string(), + header_with_proof.header.number, + vec![ + content_pair_to_string_pair(last_header.clone()), + content_pair_to_string_pair(history_content), + ], + ), + HistoryContentKey::BlockReceipts(_) => ( + "Block Receipt".to_string(), + header_with_proof.header.number, + vec![ + content_pair_to_string_pair(last_header.clone()), + content_pair_to_string_pair(history_content), + ], + ), + HistoryContentKey::EpochAccumulator(_) => ( + "Epoch Accumulator".to_string(), + header_with_proof.header.number, + vec![], + ), + } + } else { + unreachable!("History test dated is formatted incorrectly") + }; + result.push(ProcessedContent { + content_type, + block_number, + test_data, + }) + } + result +} + +dyn_async! { + async fn test_portal_interop<'a> (test: &'a mut Test, _client: Option) { + // Get all available portal clients + let clients = test.sim.client_types().await; + + let values = std::fs::read_to_string(TEST_DATA_FILE_PATH) + .expect("cannot find test asset"); + let values: Value = serde_yaml::from_str(&values).unwrap(); + let content: Vec<(HistoryContentKey, HistoryContentValue)> = values.as_sequence().unwrap().iter().map(|value| { + let content_key: HistoryContentKey = + serde_yaml::from_value(value.get("content_key").unwrap().clone()).unwrap(); + let content_value: HistoryContentValue = + serde_yaml::from_value(value.get("content_value").unwrap().clone()).unwrap(); + (content_key, content_value) + }).collect(); + + // Iterate over all possible pairings of clients and run the tests (including self-pairings) + for (client_a, client_b) in clients.iter().cartesian_product(clients.iter()) { + for ProcessedContent { content_type, block_number, test_data } in process_content(content.clone()) { + test.run( + NClientTestSpec { + name: format!("OFFER {}: block number {}{} {} --> {}", content_type, block_number, get_flair(block_number), client_a.name, client_b.name), + description: "".to_string(), + always_run: false, + run: test_offer, + environments: None, + test_data: Some(test_data.clone()), + clients: vec![client_a.clone(), client_b.clone()], + } + ).await; + + test.run( + NClientTestSpec { + name: format!("RecursiveFindContent {}: block number {}{} {} --> {}", content_type, block_number, get_flair(block_number), client_a.name, client_b.name), + description: "".to_string(), + always_run: false, + run: test_recursive_find_content, + environments: None, + test_data: Some(test_data.clone()), + clients: vec![client_a.clone(), client_b.clone()], + } + ).await; + + test.run( + NClientTestSpec { + name: format!("FindContent {}: block number {}{} {} --> {}", content_type, block_number, get_flair(block_number), client_a.name, client_b.name), + description: "".to_string(), + always_run: false, + run: test_find_content, + environments: None, + test_data: Some(test_data), + clients: vec![client_a.clone(), client_b.clone()], + } + ).await; + } + + // Test portal history ping + test.run(NClientTestSpec { + name: format!("PING {} --> {}", client_a.name, client_b.name), + description: "".to_string(), + always_run: false, + run: test_ping, + environments: None, + test_data: None, + clients: vec![client_a.clone(), client_b.clone()], + } + ).await; + + // Test find content non-present + test.run(NClientTestSpec { + name: format!("FIND_CONTENT non present {} --> {}", client_a.name, client_b.name), + description: "find content: calls find content that doesn't exist".to_string(), + always_run: false, + run: test_find_content_non_present, + environments: None, + test_data: None, + clients: vec![client_a.clone(), client_b.clone()], + } + ).await; + + // Test find nodes distance zero + test.run(NClientTestSpec { + name: format!("FIND_NODES Distance 0 {} --> {}", client_a.name, client_b.name), + description: "find nodes: distance zero expect called nodes enr".to_string(), + always_run: false, + run: test_find_nodes_zero_distance, + environments: None, + test_data: None, + clients: vec![client_a.clone(), client_b.clone()], + } + ).await; + + // Test gossiping a collection of blocks to node B (B will gossip back to A) + test.run( + NClientTestSpec { + name: format!("GOSSIP blocks from A:{} --> B:{}", client_a.name, client_b.name), + description: "".to_string(), + always_run: false, + run: test_gossip_two_nodes, + environments: None, + test_data: Some(content.clone().into_iter().map(content_pair_to_string_pair).collect()), + clients: vec![client_a.clone(), client_b.clone()], + } + ).await; + } + } +} + +dyn_async! { + // test that a node will not return content via FINDCONTENT. + async fn test_find_content_non_present<'a>(clients: Vec, _: Option>) { + let (client_a, client_b) = match clients.iter().collect_tuple() { + Some((client_a, client_b)) => (client_a, client_b), + None => { + panic!("Unable to get expected amount of clients from NClientTestSpec"); + } + }; + let header_with_proof_key: HistoryContentKey = serde_json::from_value(json!(HEADER_WITH_PROOF_KEY)).unwrap(); + + let target_enr = match client_b.rpc.node_info().await { + Ok(node_info) => node_info.enr, + Err(err) => { + panic!("Error getting node info: {err:?}"); + } + }; + + let result = client_a.rpc.find_content(target_enr, header_with_proof_key.clone()).await; + + match result { + Ok(result) => { + match result { + ContentInfo::Enrs{ enrs: val } => { + if !val.is_empty() { + panic!("Error: Unexpected FINDCONTENT response: expected ContentInfo::Enrs length 0 got {}", val.len()); + } + }, + ContentInfo::Content{ content: _, .. } => { + panic!("Error: Unexpected FINDCONTENT response: wasn't supposed to return back content"); + }, + other => { + panic!("Error: Unexpected FINDCONTENT response: {other:?}"); + } + } + }, + Err(err) => { + panic!("Error: Unable to get response from FINDCONTENT request: {err:?}"); + } + } + } +} + +dyn_async! { + async fn test_offer<'a>(clients: Vec, test_data: Option>) { + let (client_a, client_b) = match clients.iter().collect_tuple() { + Some((client_a, client_b)) => (client_a, client_b), + None => { + panic!("Unable to get expected amount of clients from NClientTestSpec"); + } + }; + let test_data = match test_data { + Some(test_data) => test_data, + None => panic!("Expected test data non was provided"), + }; + if let Some((optional_key, optional_value)) = test_data.get(1) { + let optional_key: HistoryContentKey = + serde_json::from_value(json!(optional_key)).unwrap(); + let optional_value: HistoryContentValue = + serde_json::from_value(json!(optional_value)).unwrap(); + match client_b.rpc.store(optional_key, optional_value).await { + Ok(result) => if !result { + panic!("Unable to store optional content for recursive find content"); + }, + Err(err) => { + panic!("Error storing optional content for recursive find content: {err:?}"); + } + } + } + let (target_key, target_value) = test_data.first().expect("Target content is required for this test"); + let target_key: HistoryContentKey = + serde_json::from_value(json!(target_key)).unwrap(); + let target_value: HistoryContentValue = + serde_json::from_value(json!(target_value)).unwrap(); + match client_b.rpc.store(target_key.clone(), target_value.clone()).await { + Ok(result) => if !result { + panic!("Error storing target content for recursive find content"); + }, + Err(err) => { + panic!("Error storing target content: {err:?}"); + } + } + + let target_enr = match client_b.rpc.node_info().await { + Ok(node_info) => node_info.enr, + Err(err) => { + panic!("Error getting node info: {err:?}"); + } + }; + + let _ = client_a.rpc.offer(target_enr, target_key.clone(), Some(target_value.clone())).await; + + tokio::time::sleep(Duration::from_secs(8)).await; + + match client_b.rpc.local_content(target_key).await { + Ok(possible_content) => { + match possible_content { + PossibleHistoryContentValue::ContentPresent(content) => { + if content != target_value { + panic!("Error receiving content: Expected content: {target_value:?}, Received content: {content:?}"); + } + } + PossibleHistoryContentValue::ContentAbsent => { + panic!("Expected content not found!"); + } + } + } + Err(err) => { + panic!("Unable to get received content: {err:?}"); + } + } + } +} + +dyn_async! { + async fn test_ping<'a>(clients: Vec, _: Option>) { + let (client_a, client_b) = match clients.iter().collect_tuple() { + Some((client_a, client_b)) => (client_a, client_b), + None => { + panic!("Unable to get expected amount of clients from NClientTestSpec"); + } + }; + let target_enr = match client_b.rpc.node_info().await { + Ok(node_info) => node_info.enr, + Err(err) => { + panic!("Error getting node info: {err:?}"); + } + }; + + let pong = client_a.rpc.ping(target_enr).await; + + if let Err(err) = pong { + panic!("Unable to receive pong info: {err:?}"); + } + + // Verify that client_b stored client_a its ENR through the base layer + // handshake mechanism. + let stored_enr = match client_a.rpc.node_info().await { + Ok(node_info) => node_info.enr, + Err(err) => { + panic!("Error getting node info: {err:?}"); + } + }; + + match HistoryNetworkApiClient::get_enr(&client_b.rpc, stored_enr.node_id()).await { + Ok(response) => { + if response != stored_enr { + panic!("Response from GetEnr didn't return expected ENR. Got: {response}; Expected: {stored_enr}") + } + }, + Err(err) => panic!("Failed while trying to get client A's ENR from client B: {err}"), + } + } +} + +dyn_async! { + async fn test_find_nodes_zero_distance<'a>(clients: Vec, _: Option>) { + let (client_a, client_b) = match clients.iter().collect_tuple() { + Some((client_a, client_b)) => (client_a, client_b), + None => { + panic!("Unable to get expected amount of clients from NClientTestSpec"); + } + }; + let target_enr = match client_b.rpc.node_info().await { + Ok(node_info) => node_info.enr, + Err(err) => { + panic!("Error getting node info: {err:?}"); + } + }; + + match client_a.rpc.find_nodes(target_enr.clone(), vec![0]).await { + Ok(response) => { + if response.len() != 1 { + panic!("Response from FindNodes didn't return expected length of 1"); + } + + match response.first() { + Some(response_enr) => { + if *response_enr != target_enr { + panic!("Response from FindNodes didn't return expected Enr"); + } + }, + None => panic!("Error find nodes zero distance wasn't supposed to return None"), + } + } + Err(err) => panic!("{}", &err.to_string()), + } + } +} + +dyn_async! { + // test that a node will return a content via RECURSIVEFINDCONTENT template that it has stored locally + async fn test_recursive_find_content<'a>(clients: Vec, test_data: Option>) { + let (client_a, client_b) = match clients.iter().collect_tuple() { + Some((client_a, client_b)) => (client_a, client_b), + None => { + panic!("Unable to get expected amount of clients from NClientTestSpec"); + } + }; + let test_data = match test_data { + Some(test_data) => test_data, + None => panic!("Expected test data non was provided"), + }; + if let Some((optional_key, optional_value)) = test_data.get(1) { + let optional_key: HistoryContentKey = + serde_json::from_value(json!(optional_key)).unwrap(); + let optional_value: HistoryContentValue = + serde_json::from_value(json!(optional_value)).unwrap(); + match client_b.rpc.store(optional_key, optional_value).await { + Ok(result) => if !result { + panic!("Unable to store optional content for recursive find content"); + }, + Err(err) => { + panic!("Error storing optional content for recursive find content: {err:?}"); + } + } + } + + let (target_key, target_value) = test_data.first().expect("Target content is required for this test"); + let target_key: HistoryContentKey = + serde_json::from_value(json!(target_key)).unwrap(); + let target_value: HistoryContentValue = + serde_json::from_value(json!(target_value)).unwrap(); + match client_b.rpc.store(target_key.clone(), target_value.clone()).await { + Ok(result) => if !result { + panic!("Error storing target content for recursive find content"); + }, + Err(err) => { + panic!("Error storing target content: {err:?}"); + } + } + + let target_enr = match client_b.rpc.node_info().await { + Ok(node_info) => node_info.enr, + Err(err) => { + panic!("Error getting node info: {err:?}"); + } + }; + + match HistoryNetworkApiClient::add_enr(&client_a.rpc, target_enr.clone()).await { + Ok(response) => match response { + true => (), + false => panic!("AddEnr expected to get true and instead got false") + }, + Err(err) => panic!("{}", &err.to_string()), + } + + match client_a.rpc.recursive_find_content(target_key.clone()).await { + Ok(result) => { + match result { + ContentInfo::Content{ content: ethportal_api::PossibleHistoryContentValue::ContentPresent(val), utp_transfer } => { + if val != target_value { + panic!("Error: Unexpected RECURSIVEFINDCONTENT response: didn't return expected target content"); + } + + if target_value.encode().len() < MAX_PORTAL_CONTENT_PAYLOAD_SIZE { + if utp_transfer { + panic!("Error: Unexpected RECURSIVEFINDCONTENT response: utp_transfer was supposed to be false"); + } + } else if !utp_transfer { + panic!("Error: Unexpected RECURSIVEFINDCONTENT response: utp_transfer was supposed to be true"); + } + }, + other => { + panic!("Error: Unexpected RECURSIVEFINDCONTENT response: {other:?}"); + } + } + }, + Err(err) => { + panic!("Error: Unable to get response from RECURSIVEFINDCONTENT request: {err:?}"); + } + } + } +} + +dyn_async! { + // test that a node will return a x content via FINDCONTENT that it has stored locally + async fn test_find_content<'a> (clients: Vec, test_data: Option>) { + let (client_a, client_b) = match clients.iter().collect_tuple() { + Some((client_a, client_b)) => (client_a, client_b), + None => { + panic!("Unable to get expected amount of clients from NClientTestSpec"); + } + }; + let test_data = match test_data { + Some(test_data) => test_data, + None => panic!("Expected test data none was provided"), + }; + if let Some((optional_key, optional_value)) = test_data.get(1) { + let optional_key: HistoryContentKey = + serde_json::from_value(json!(optional_key)).unwrap(); + let optional_value: HistoryContentValue = + serde_json::from_value(json!(optional_value)).unwrap(); + match client_b.rpc.store(optional_key, optional_value).await { + Ok(result) => if !result { + panic!("Unable to store optional content for find content"); + }, + Err(err) => { + panic!("Error storing optional content for find content: {err:?}"); + } + } + } + + let (target_key, target_value) = test_data.first().expect("Target content is required for this test"); + let target_key: HistoryContentKey = + serde_json::from_value(json!(target_key)).unwrap(); + let target_value: HistoryContentValue = + serde_json::from_value(json!(target_value)).unwrap(); + match client_b.rpc.store(target_key.clone(), target_value.clone()).await { + Ok(result) => if !result { + panic!("Error storing target content for find content"); + }, + Err(err) => { + panic!("Error storing target content: {err:?}"); + } + } + + let target_enr = match client_b.rpc.node_info().await { + Ok(node_info) => node_info.enr, + Err(err) => { + panic!("Error getting node info: {err:?}"); + } + }; + + match client_a.rpc.find_content(target_enr, target_key.clone()).await { + Ok(result) => { + match result { + ContentInfo::Content{ content: ethportal_api::PossibleHistoryContentValue::ContentPresent(val), utp_transfer } => { + if val != target_value { + panic!("Error: Unexpected FINDCONTENT response: didn't return expected block body"); + } + + if target_value.encode().len() < MAX_PORTAL_CONTENT_PAYLOAD_SIZE { + if utp_transfer { + panic!("Error: Unexpected FINDCONTENT response: utp_transfer was supposed to be false"); + } + } else if !utp_transfer { + panic!("Error: Unexpected FINDCONTENT response: utp_transfer was supposed to be true"); + } + }, + other => { + panic!("Error: Unexpected FINDCONTENT response: {other:?}"); + } + } + }, + Err(err) => { + panic!("Error: Unable to get response from FINDCONTENT request: {err:?}"); + } + } + } +} + +dyn_async! { + async fn test_gossip_two_nodes<'a> (clients: Vec, test_data: Option>) { + let (client_a, client_b) = match clients.iter().collect_tuple() { + Some((client_a, client_b)) => (client_a, client_b), + None => { + panic!("Unable to get expected amount of clients from NClientTestSpec"); + } + }; + let test_data = match test_data { + Some(test_data) => test_data, + None => panic!("Expected test data non was provided"), + }; + // connect clients + let client_b_enr = match client_b.rpc.node_info().await { + Ok(node_info) => node_info.enr, + Err(err) => { + panic!("Error getting node info: {err:?}"); + } + }; + match HistoryNetworkApiClient::add_enr(&client_a.rpc, client_b_enr.clone()).await { + Ok(response) => match response { + true => (), + false => panic!("AddEnr expected to get true and instead got false") + }, + Err(err) => panic!("{}", &err.to_string()), + } + + // With default node settings nodes should be storing all content + for (content_key, content_value) in test_data.clone() { + let content_key: HistoryContentKey = + serde_json::from_value(json!(content_key)).unwrap(); + let content_value: HistoryContentValue = + serde_json::from_value(json!(content_value)).unwrap(); + + match client_a.rpc.gossip(content_key.clone(), content_value.clone()).await { + Ok(nodes_gossiped_to) => { + if nodes_gossiped_to != 1 { + panic!("We expected to gossip to 1 node instead we gossiped to: {nodes_gossiped_to}"); + } + } + Err(err) => { + panic!("Unable to get received content: {err:?}"); + } + } + + if let HistoryContentKey::BlockHeaderWithProof(_) = content_key { + tokio::time::sleep(Duration::from_secs(1)).await; + } + } + + // wait test_data.len() seconds for data to propagate, giving more time if more items are propagating + tokio::time::sleep(Duration::from_secs(test_data.len() as u64)).await; + + // process raw test data to generate content details for error output + let (first_header_key, first_header_value) = test_data.first().unwrap(); + let first_header_key: HistoryContentKey = + serde_json::from_value(json!(first_header_key)).unwrap(); + let first_header_value: HistoryContentValue = + serde_json::from_value(json!(first_header_value)).unwrap(); + let mut last_header_seen: (HistoryContentKey, HistoryContentValue) = (first_header_key, first_header_value); + let mut result = vec![]; + for (content_key, content_value) in test_data.into_iter() { + let content_key: HistoryContentKey = + serde_json::from_value(json!(content_key)).unwrap(); + let content_value: HistoryContentValue = + serde_json::from_value(json!(content_value)).unwrap(); + + if let HistoryContentKey::BlockHeaderWithProof(_) = &content_key { + last_header_seen = (content_key.clone(), content_value.clone()); + } + let content_details = + if let HistoryContentValue::BlockHeaderWithProof(header_with_proof) = &last_header_seen.1 { + let content_type = match &content_key { + HistoryContentKey::BlockHeaderWithProof(_) => "header".to_string(), + HistoryContentKey::BlockBody(_) => "body".to_string(), + HistoryContentKey::BlockReceipts(_) => "receipt".to_string(), + HistoryContentKey::EpochAccumulator(_) => "epoch accumulator".to_string(), + }; + format!( + "{}{} {}", + header_with_proof.header.number, + get_flair(header_with_proof.header.number), + content_type + ) + } else { + unreachable!("History test data is formatted incorrectly. Header wasn't infront of data. Please refer to test data file for more information") + }; + + match client_b.rpc.local_content(content_key.clone()).await { + Ok(expected_value) => { + match expected_value { + PossibleHistoryContentValue::ContentPresent(actual_value) => { + if actual_value != content_value { + result.push(format!("Error content received for block {content_details} was different then expected")); + } + } + PossibleHistoryContentValue::ContentAbsent => { + result.push(format!("Error content for block {content_details} was absent")); + } + } + } + Err(err) => { + panic!("Unable to get received content: {err:?}"); + } + } + } + + if !result.is_empty() { + panic!("Client B: {:?}", result); + } + } +} From 16cb416531ed76194d8dc7b4e09ac9ea70b24b18 Mon Sep 17 00:00:00 2001 From: Kolby Moroz Liebl <31669092+KolbyML@users.noreply.github.com> Date: Thu, 1 Feb 2024 20:29:59 -0700 Subject: [PATCH 2/2] updated rust-simulators.sh to be excutable --- .circleci/rust-simulators.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .circleci/rust-simulators.sh diff --git a/.circleci/rust-simulators.sh b/.circleci/rust-simulators.sh old mode 100644 new mode 100755