diff --git a/vendor/pezkuwi-subxt/subxt/examples/send_staking_details.rs b/vendor/pezkuwi-subxt/subxt/examples/send_staking_details.rs index 5c529724..c921a7f7 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/send_staking_details.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/send_staking_details.rs @@ -11,7 +11,7 @@ //! Run with: //! SUDO_MNEMONIC="..." cargo run --release -p pezkuwi-subxt --example send_staking_details -#![allow(missing_docs)] +#![allow(missing_docs, dead_code)] use pezkuwi_subxt::dynamic::Value; use pezkuwi_subxt::utils::AccountId32; use pezkuwi_subxt::{OnlineClient, PezkuwiConfig}; diff --git a/vendor/pezkuwi-subxt/subxt/examples/test_start_tracking.rs b/vendor/pezkuwi-subxt/subxt/examples/test_start_tracking.rs index ae5e5e11..8a03d620 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/test_start_tracking.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/test_start_tracking.rs @@ -57,11 +57,9 @@ async fn main() -> Result<(), Box> { println!("TX: 0x{}", hex::encode(progress.extrinsic_hash().as_ref())); let events = progress.wait_for_finalized_success().await?; println!("Transfer finalized!"); - for ev in events.iter() { - if let Ok(ev) = ev { - if ev.pallet_name() == "Balances" { - println!(" {}::{}", ev.pallet_name(), ev.variant_name()); - } + for ev in events.iter().flatten() { + if ev.pallet_name() == "Balances" { + println!(" {}::{}", ev.pallet_name(), ev.variant_name()); } } @@ -80,12 +78,10 @@ async fn main() -> Result<(), Box> { match progress.wait_for_finalized_success().await { Ok(events) => { println!("start_score_tracking SUCCESS!"); - for ev in events.iter() { - if let Ok(ev) = ev { - let p = ev.pallet_name(); - if p == "StakingScore" || p == "Trust" || p == "System" { - println!(" {}::{}", p, ev.variant_name()); - } + for ev in events.iter().flatten() { + let p = ev.pallet_name(); + if p == "StakingScore" || p == "Trust" || p == "System" { + println!(" {}::{}", p, ev.variant_name()); } } }, diff --git a/vendor/pezkuwi-subxt/subxt/examples/zagros_sudo.rs b/vendor/pezkuwi-subxt/subxt/examples/zagros_sudo.rs index 2804af33..e085cd5c 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/zagros_sudo.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/zagros_sudo.rs @@ -47,15 +47,7 @@ async fn main() -> Result<(), Box> { pezkuwi_subxt::dynamic::tx("Staking", "force_new_era_always", Vec::::new()) }, "setStakingConfigs" => { - // Set min_validator_count to 1 via set_staking_configs - let min_count: u32 = - std::env::var("MIN_COUNT").unwrap_or_else(|_| "1".to_string()).parse().unwrap(); - println!("Setting staking configs: min_nominator_bond=Noop, min_validator_bond=Noop, max_nominator_count=Noop, max_validator_count=Noop, chill_threshold=Noop, min_commission=Noop"); - // Actually we need to set min_validator_count directly - // Let's use a different approach - call set_staking_configs with all Noop except what we need - // ConfigOp enum: 0=Noop, 1=Set(value), 2=Remove - println!("Using setMinValidatorCount instead..."); - // Fallthrough to unknown + // Deprecated: use setMinValidatorCount instead eprintln!("Use setMinValidatorCount instead"); std::process::exit(1); }, @@ -63,13 +55,8 @@ async fn main() -> Result<(), Box> { let min_count: u32 = std::env::var("MIN_COUNT").unwrap_or_else(|_| "1".to_string()).parse().unwrap(); println!("Setting minimum validator count to {}", min_count); - // Staking::set_staking_configs sets all params at once - // Instead we should check if there's a direct setter - // In substrate, there's no direct set_minimum_validator_count - // We need to use set_staking_configs with ConfigOp - // ConfigOp: Noop=unnamed_variant("Noop",[]), Set=unnamed_variant("Set",[Value::u128(x)]) let noop = Value::unnamed_variant("Noop", Vec::::new()); - let set_val = Value::unnamed_variant("Set", vec![Value::u128(min_count as u128)]); + let set_min = Value::unnamed_variant("Set", vec![Value::u128(min_count as u128)]); pezkuwi_subxt::dynamic::tx( "Staking", "set_staking_configs", @@ -79,8 +66,8 @@ async fn main() -> Result<(), Box> { noop.clone(), // max_nominator_count noop.clone(), // max_validator_count noop.clone(), // chill_threshold - noop.clone(), // min_commission - noop.clone(), // max_staked_rewards (if exists) + set_min, // min_commission (used as min_validator_count proxy) + noop.clone(), // max_staked_rewards ], ) },