Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ async fn full_node_catching_up() -> Result<(), anyhow::Error> {
)
.await?;

for (name, timeout_secs) in [("dave", 250u64), ("eve", 250u64), ("ferdie", 250u64)] {
for (name, timeout_secs) in [("dave", 250u64), ("eve", 250u64)] {
log::info!("Ensuring {name} reports expected block height");
assert!(network
.get_node(name)?
Expand Down Expand Up @@ -77,7 +77,6 @@ async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
// - charlie - validator
// - dave - full node; synchronizes only with charlie
// - eve - RPC full node; synchronizes only with charlie
// - ferdie - light client; synchronizes only with charlie
let config = NetworkConfigBuilder::new()
.with_relaychain(|r| {
r.with_chain("rococo-local")
Expand Down Expand Up @@ -109,13 +108,6 @@ async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
("--reserved-nodes", "{{ZOMBIE:charlie:multiaddr}}").into(),
])
})
.with_collator(|n| {
n.with_name("ferdie").validator(false).with_args(vec![
("--relay-chain-light-client").into(),
("--reserved-only").into(),
("--reserved-nodes", "{{ZOMBIE:charlie:multiaddr}}").into(),
])
})
})
.with_global_settings(|global_settings| match std::env::var("ZOMBIENET_SDK_BASE_DIR") {
Ok(val) => global_settings.with_base_dir(val),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ async fn full_node_warp_sync() -> Result<(), anyhow::Error> {
log::info!("Ensuring parachain is registered");
assert_para_is_registered(&alice_client, ParaId::from(PARA_ID), 10).await?;

for name in ["two", "three", "four", "five"] {
for name in ["two", "three", "four"] {
log::info!("Checking full node {name} is syncing");
assert!(network
.get_node(name)?
Expand Down Expand Up @@ -61,7 +61,6 @@ async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
// - two - full node
// - three - full node
// - four - full node
// - five - full node
let config = NetworkConfigBuilder::new()
.with_relaychain(|r| {
r.with_chain("rococo-local")
Expand Down Expand Up @@ -123,13 +122,6 @@ async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
("--relay-chain-rpc-urls", "{{ZOMBIE:dave:ws_uri}}").into(),
])
})
.with_collator(|n| {
n.with_name("five").validator(false).with_args(vec![
("-lsync=debug").into(),
("--sync", "warp").into(),
("--relay-chain-light-client").into(),
])
})
})
.with_global_settings(|global_settings| match std::env::var("ZOMBIENET_SDK_BASE_DIR") {
Ok(val) => global_settings.with_base_dir(val),
Expand Down
11 changes: 1 addition & 10 deletions cumulus/zombienet/zombienet-sdk/tests/zombie_ci/pov_recovery.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ async fn pov_recovery() -> Result<(), anyhow::Error> {
("charlie", 600u64),
("one", 800u64),
("two", 800u64),
// Re-enable once we upgraded from smoldot 0.11.0 and https://github.com/paritytech/polkadot-sdk/pull/1631 is merged
// ("three", 800u64),
("eve", 800u64),
] {
log::info!("Checking block production for {name} within {timeout_secs}s");
Expand All @@ -86,7 +84,7 @@ async fn pov_recovery() -> Result<(), anyhow::Error> {
wait_until_timeout_elapses: false,
};

for name in ["one", "two", "three", "eve", "charlie", "alice"] {
for name in ["one", "two", "eve", "charlie", "alice"] {
log::info!("Ensuring blocks are imported using PoV recovery by {name}");
let result = network
.get_node(name)?
Expand Down Expand Up @@ -142,8 +140,6 @@ async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
// - RPC collator which does not produce blocks
// - two
// - RPC full node
// - three
// - light client
let config = NetworkConfigBuilder::new()
.with_relaychain(|r| {
let r = r
Expand Down Expand Up @@ -216,11 +212,6 @@ async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
)
.into()]))
})
.with_collator(|c| {
c.with_name("three")
.validator(false)
.with_args(build_collator_args(vec!["--relay-chain-light-client".into()]))
})
})
.with_global_settings(|global_settings| match std::env::var("ZOMBIENET_SDK_BASE_DIR") {
Ok(val) => global_settings.with_base_dir(val),
Expand Down
Loading