diff --git a/vendor/pezkuwi-subxt/subxt/examples/asset_hub_nom_pools.rs b/vendor/pezkuwi-subxt/subxt/examples/asset_hub_nom_pools.rs index 52f1540c..1df687fa 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/asset_hub_nom_pools.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/asset_hub_nom_pools.rs @@ -187,10 +187,8 @@ async fn main() -> Result<(), Box> { match details.wait_for_success().await { Ok(events) => { println!(" TX SUCCESS!"); - for event in events.iter() { - if let Ok(ev) = event { - println!(" Event: {}::{}", ev.pallet_name(), ev.variant_name()); - } + for ev in events.iter().flatten() { + println!(" Event: {}::{}", ev.pallet_name(), ev.variant_name()); } }, Err(e) => println!(" TX dispatch error: {}", e), diff --git a/vendor/pezkuwi-subxt/subxt/examples/bond_extra_validators.rs b/vendor/pezkuwi-subxt/subxt/examples/bond_extra_validators.rs index ee65e37d..c89e21d4 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/bond_extra_validators.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/bond_extra_validators.rs @@ -114,26 +114,18 @@ async fn main() -> Result<(), Box> { Some(Ok(TxStatus::InBestBlock(details))) => { match details.wait_for_success().await { Ok(events) => { - for event in events.iter() { - if let Ok(ev) = event { - if ev.pallet_name() == "Staking" - && ev.variant_name() == "Bonded" - { - println!(" SUCCESS: {} HEZ bonded", bond_hez); - tx_ok = true; - } + for ev in events.iter().flatten() { + if ev.pallet_name() == "Staking" + && ev.variant_name() == "Bonded" + { + println!(" SUCCESS: {} HEZ bonded", bond_hez); + tx_ok = true; } } if !tx_ok { println!(" WARNING: No Staking::Bonded event"); - for event in events.iter() { - if let Ok(ev) = event { - println!( - " {}::{}", - ev.pallet_name(), - ev.variant_name() - ); - } + for ev in events.iter().flatten() { + println!(" {}::{}", ev.pallet_name(), ev.variant_name()); } } }, diff --git a/vendor/pezkuwi-subxt/subxt/examples/create_nomination_pools.rs b/vendor/pezkuwi-subxt/subxt/examples/create_nomination_pools.rs index f187423a..89e8fb37 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/create_nomination_pools.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/create_nomination_pools.rs @@ -101,10 +101,8 @@ async fn wait_for_success( Some(Ok(TxStatus::InBestBlock(details))) => match details.wait_for_success().await { Ok(events) => { println!(" {} SUCCESS!", label); - for event in events.iter() { - if let Ok(ev) = event { - println!(" {}::{}", ev.pallet_name(), ev.variant_name()); - } + for ev in events.iter().flatten() { + println!(" {}::{}", ev.pallet_name(), ev.variant_name()); } return Ok(true); }, diff --git a/vendor/pezkuwi-subxt/subxt/examples/fix_force_era.rs b/vendor/pezkuwi-subxt/subxt/examples/fix_force_era.rs index 52bee237..41d83133 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/fix_force_era.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/fix_force_era.rs @@ -64,12 +64,10 @@ async fn main() -> Result<(), Box> { match details.wait_for_success().await { Ok(events) => { let mut sudid = false; - for event in events.iter() { - if let Ok(ev) = event { - println!(" Event: {}::{}", ev.pallet_name(), ev.variant_name()); - if ev.pallet_name() == "Sudo" && ev.variant_name() == "Sudid" { - sudid = true; - } + for ev in events.iter().flatten() { + println!(" Event: {}::{}", ev.pallet_name(), ev.variant_name()); + if ev.pallet_name() == "Sudo" && ev.variant_name() == "Sudid" { + sudid = true; } } if sudid { diff --git a/vendor/pezkuwi-subxt/subxt/examples/mint_welati_tiki.rs b/vendor/pezkuwi-subxt/subxt/examples/mint_welati_tiki.rs index b1186152..58e666ff 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/mint_welati_tiki.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/mint_welati_tiki.rs @@ -216,16 +216,12 @@ async fn main() -> Result<(), Box> { Ok(events) => { let mut has_sudid = false; let mut has_sent = false; - for event in events.iter() { - if let Ok(ev) = event { - if ev.pallet_name() == "Sudo" && ev.variant_name() == "Sudid" { - has_sudid = true; - } - if ev.pallet_name() == "XcmPallet" - && ev.variant_name() == "Sent" - { - has_sent = true; - } + for ev in events.iter().flatten() { + if ev.pallet_name() == "Sudo" && ev.variant_name() == "Sudid" { + has_sudid = true; + } + if ev.pallet_name() == "XcmPallet" && ev.variant_name() == "Sent" { + has_sent = true; } } if has_sudid && has_sent { @@ -233,10 +229,8 @@ async fn main() -> Result<(), Box> { tx_ok = true; } else { println!(" WARNING: Missing expected events"); - for event in events.iter() { - if let Ok(ev) = event { - println!(" {}::{}", ev.pallet_name(), ev.variant_name()); - } + for ev in events.iter().flatten() { + println!(" {}::{}", ev.pallet_name(), ev.variant_name()); } } }, diff --git a/vendor/pezkuwi-subxt/subxt/examples/remark_mainnet.rs b/vendor/pezkuwi-subxt/subxt/examples/remark_mainnet.rs index b9811b08..8f31eaaf 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/remark_mainnet.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/remark_mainnet.rs @@ -45,10 +45,8 @@ async fn main() -> Result<(), Box> { match details.wait_for_success().await { Ok(events) => { println!(" SUCCESS!"); - for event in events.iter() { - if let Ok(ev) = event { - println!(" {}::{}", ev.pallet_name(), ev.variant_name()); - } + for ev in events.iter().flatten() { + println!(" {}::{}", ev.pallet_name(), ev.variant_name()); } }, Err(e) => println!(" Error: {}", e), diff --git a/vendor/pezkuwi-subxt/subxt/examples/send_staking_details.rs b/vendor/pezkuwi-subxt/subxt/examples/send_staking_details.rs index 0d7f1bd8..5c529724 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/send_staking_details.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/send_staking_details.rs @@ -332,16 +332,12 @@ async fn main() -> Result<(), Box> { Ok(events) => { let mut has_sudid = false; let mut has_sent = false; - for event in events.iter() { - if let Ok(ev) = event { - if ev.pallet_name() == "Sudo" && ev.variant_name() == "Sudid" { - has_sudid = true; - } - if ev.pallet_name() == "XcmPallet" - && ev.variant_name() == "Sent" - { - has_sent = true; - } + for ev in events.iter().flatten() { + if ev.pallet_name() == "Sudo" && ev.variant_name() == "Sudid" { + has_sudid = true; + } + if ev.pallet_name() == "XcmPallet" && ev.variant_name() == "Sent" { + has_sent = true; } } if has_sudid && has_sent { @@ -349,10 +345,8 @@ async fn main() -> Result<(), Box> { tx_ok = true; } else { println!(" WARNING: Events:"); - for event in events.iter() { - if let Ok(ev) = event { - println!(" {}::{}", ev.pallet_name(), ev.variant_name()); - } + for ev in events.iter().flatten() { + println!(" {}::{}", ev.pallet_name(), ev.variant_name()); } } }, diff --git a/vendor/pezkuwi-subxt/subxt/examples/set_pool_metadata.rs b/vendor/pezkuwi-subxt/subxt/examples/set_pool_metadata.rs index 25e88fa9..4df2dda5 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/set_pool_metadata.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/set_pool_metadata.rs @@ -110,10 +110,8 @@ async fn main() -> Result<(), Box> { match details.wait_for_success().await { Ok(events) => { println!(" SUCCESS!"); - for event in events.iter() { - if let Ok(ev) = event { - println!(" {}::{}", ev.pallet_name(), ev.variant_name()); - } + for ev in events.iter().flatten() { + println!(" {}::{}", ev.pallet_name(), ev.variant_name()); } ok = true; }, diff --git a/vendor/pezkuwi-subxt/subxt/examples/transfer_to_validators.rs b/vendor/pezkuwi-subxt/subxt/examples/transfer_to_validators.rs index 1f911c42..e2babae5 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/transfer_to_validators.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/transfer_to_validators.rs @@ -116,26 +116,18 @@ async fn main() -> Result<(), Box> { Some(Ok(TxStatus::InBestBlock(details))) => { match details.wait_for_success().await { Ok(events) => { - for event in events.iter() { - if let Ok(ev) = event { - if ev.pallet_name() == "Balances" - && ev.variant_name() == "Transfer" - { - println!(" SUCCESS: {} HEZ transferred", amount_hez); - tx_ok = true; - } + for ev in events.iter().flatten() { + if ev.pallet_name() == "Balances" + && ev.variant_name() == "Transfer" + { + println!(" SUCCESS: {} HEZ transferred", amount_hez); + tx_ok = true; } } if !tx_ok { println!(" WARNING: No Transfer event found"); - for event in events.iter() { - if let Ok(ev) = event { - println!( - " {}::{}", - ev.pallet_name(), - ev.variant_name() - ); - } + for ev in events.iter().flatten() { + println!(" {}::{}", ev.pallet_name(), ev.variant_name()); } } }, diff --git a/vendor/pezkuwi-subxt/subxt/examples/validator_welati_batch.rs b/vendor/pezkuwi-subxt/subxt/examples/validator_welati_batch.rs index 30e8b011..42536f23 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/validator_welati_batch.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/validator_welati_batch.rs @@ -14,7 +14,7 @@ //! SUDO_MNEMONIC="..." cargo run --release -p pezkuwi-subxt --example validator_welati_batch //! SUDO_MNEMONIC="..." SKIP=5 cargo run --release -p pezkuwi-subxt --example validator_welati_batch -#![allow(missing_docs)] +#![allow(missing_docs, dead_code)] use pezkuwi_subxt::dynamic::Value; use pezkuwi_subxt::utils::AccountId32; use pezkuwi_subxt::{OnlineClient, PezkuwiConfig}; @@ -372,16 +372,12 @@ async fn main() -> Result<(), Box> { Ok(events) => { let mut has_sudid = false; let mut has_sent = false; - for event in events.iter() { - if let Ok(ev) = event { - if ev.pallet_name() == "Sudo" && ev.variant_name() == "Sudid" { - has_sudid = true; - } - if ev.pallet_name() == "XcmPallet" - && ev.variant_name() == "Sent" - { - has_sent = true; - } + for ev in events.iter().flatten() { + if ev.pallet_name() == "Sudo" && ev.variant_name() == "Sudid" { + has_sudid = true; + } + if ev.pallet_name() == "XcmPallet" && ev.variant_name() == "Sent" { + has_sent = true; } } if has_sudid && has_sent { @@ -389,10 +385,8 @@ async fn main() -> Result<(), Box> { tx_ok = true; } else { println!(" WARNING: Events:"); - for event in events.iter() { - if let Ok(ev) = event { - println!(" {}::{}", ev.pallet_name(), ev.variant_name()); - } + for ev in events.iter().flatten() { + println!(" {}::{}", ev.pallet_name(), ev.variant_name()); } } }, diff --git a/vendor/pezkuwi-subxt/subxt/examples/welati_citizenship.rs b/vendor/pezkuwi-subxt/subxt/examples/welati_citizenship.rs index aa67a9b7..abab249c 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/welati_citizenship.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/welati_citizenship.rs @@ -92,10 +92,8 @@ async fn submit_and_watch( match details.wait_for_success().await { Ok(events) => { println!(" {} SUCCESS!", label); - for event in events.iter() { - if let Ok(ev) = event { - println!(" {}::{}", ev.pallet_name(), ev.variant_name()); - } + for ev in events.iter().flatten() { + println!(" {}::{}", ev.pallet_name(), ev.variant_name()); } return Ok(true); }, diff --git a/vendor/pezkuwi-subxt/subxt/examples/zagros_deregister.rs b/vendor/pezkuwi-subxt/subxt/examples/zagros_deregister.rs index b33314eb..b9788f3e 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/zagros_deregister.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/zagros_deregister.rs @@ -190,17 +190,15 @@ async fn extract_and_process( match details.wait_for_success().await { Ok(events) => { println!(" In best block! Events:"); - for event in events.iter() { - if let Ok(ev) = event { - println!(" {}::{}", ev.pallet_name(), ev.variant_name()); - if ev.pallet_name() == "Sudo" && ev.variant_name() == "Sudid" { - success = true; - } - if ev.pallet_name() == "ValidatorManager" - && ev.variant_name() == "ValidatorsDeregistered" - { - println!(" >>> ValidatorsDeregistered event confirmed!"); - } + for ev in events.iter().flatten() { + println!(" {}::{}", ev.pallet_name(), ev.variant_name()); + if ev.pallet_name() == "Sudo" && ev.variant_name() == "Sudid" { + success = true; + } + if ev.pallet_name() == "ValidatorManager" + && ev.variant_name() == "ValidatorsDeregistered" + { + println!(" >>> ValidatorsDeregistered event confirmed!"); } } }, diff --git a/vendor/pezkuwi-subxt/subxt/examples/zagros_diagnose.rs b/vendor/pezkuwi-subxt/subxt/examples/zagros_diagnose.rs index 0a6a8af8..c59a78ac 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/zagros_diagnose.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/zagros_diagnose.rs @@ -114,24 +114,22 @@ async fn main() -> Result<(), Box> { match details.wait_for_success().await { Ok(events) => { println!(" In best block! Events:"); - for event in events.iter() { - if let Ok(ev) = event { - println!(" {}::{}", ev.pallet_name(), ev.variant_name()); - if ev.pallet_name() == "Sudo" && ev.variant_name() == "Sudid" { - success = true; - } - if ev.pallet_name() == "ValidatorManager" - && ev.variant_name() == "ValidatorsDeregistered" - { - // Try to decode the event data - println!(" >>> ValidatorsDeregistered event!"); - let bytes = ev.field_bytes(); - println!( - " >>> Event field bytes ({} bytes): 0x{}", - bytes.len(), - hex::encode(&bytes[..std::cmp::min(bytes.len(), 128)]) - ); - } + for ev in events.iter().flatten() { + println!(" {}::{}", ev.pallet_name(), ev.variant_name()); + if ev.pallet_name() == "Sudo" && ev.variant_name() == "Sudid" { + success = true; + } + if ev.pallet_name() == "ValidatorManager" + && ev.variant_name() == "ValidatorsDeregistered" + { + // Try to decode the event data + println!(" >>> ValidatorsDeregistered event!"); + let bytes = ev.field_bytes(); + println!( + " >>> Event field bytes ({} bytes): 0x{}", + bytes.len(), + hex::encode(&bytes[..std::cmp::min(bytes.len(), 128)]) + ); } } }, diff --git a/vendor/pezkuwi-subxt/subxt/examples/zagros_set_retire.rs b/vendor/pezkuwi-subxt/subxt/examples/zagros_set_retire.rs index 2d54bc83..d1f1c682 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/zagros_set_retire.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/zagros_set_retire.rs @@ -142,12 +142,10 @@ async fn main() -> Result<(), Box> { match details.wait_for_success().await { Ok(events) => { println!(" In best block! Events:"); - for event in events.iter() { - if let Ok(ev) = event { - println!(" {}::{}", ev.pallet_name(), ev.variant_name()); - if ev.pallet_name() == "Sudo" && ev.variant_name() == "Sudid" { - success = true; - } + for ev in events.iter().flatten() { + println!(" {}::{}", ev.pallet_name(), ev.variant_name()); + if ev.pallet_name() == "Sudo" && ev.variant_name() == "Sudid" { + success = true; } } }, diff --git a/vendor/pezkuwi-subxt/subxt/examples/zagros_sudo.rs b/vendor/pezkuwi-subxt/subxt/examples/zagros_sudo.rs index 52939754..2804af33 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/zagros_sudo.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/zagros_sudo.rs @@ -134,10 +134,8 @@ async fn main() -> Result<(), Box> { match details.wait_for_success().await { Ok(events) => { println!(" TX SUCCESS!"); - for event in events.iter() { - if let Ok(ev) = event { - println!(" Event: {}::{}", ev.pallet_name(), ev.variant_name()); - } + for ev in events.iter().flatten() { + println!(" Event: {}::{}", ev.pallet_name(), ev.variant_name()); } }, Err(e) => println!(" TX dispatch error: {}", e), diff --git a/vendor/pezkuwi-subxt/subxt/examples/zagros_upgrade.rs b/vendor/pezkuwi-subxt/subxt/examples/zagros_upgrade.rs index e95dc117..b5871450 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/zagros_upgrade.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/zagros_upgrade.rs @@ -91,14 +91,10 @@ async fn main() -> Result<(), Box> { match details.wait_for_success().await { Ok(events) => { println!(" In best block! Events:"); - for event in events.iter() { - if let Ok(ev) = event { - println!(" {}::{}", ev.pallet_name(), ev.variant_name()); - if ev.pallet_name() == "System" - && ev.variant_name() == "CodeUpdated" - { - upgrade_ok = true; - } + for ev in events.iter().flatten() { + println!(" {}::{}", ev.pallet_name(), ev.variant_name()); + if ev.pallet_name() == "System" && ev.variant_name() == "CodeUpdated" { + upgrade_ok = true; } } }, @@ -202,12 +198,10 @@ async fn main() -> Result<(), Box> { match details.wait_for_success().await { Ok(events) => { println!(" In best block! Events:"); - for event in events.iter() { - if let Ok(ev) = event { - println!(" {}::{}", ev.pallet_name(), ev.variant_name()); - if ev.pallet_name() == "Sudo" && ev.variant_name() == "Sudid" { - storage_ok = true; - } + for ev in events.iter().flatten() { + println!(" {}::{}", ev.pallet_name(), ev.variant_name()); + if ev.pallet_name() == "Sudo" && ev.variant_name() == "Sudid" { + storage_ok = true; } } },