From 7bb18939bdf333959728b67a1d9c69fb8e79ebe5 Mon Sep 17 00:00:00 2001 From: Uncle Stretch Date: Thu, 19 Jun 2025 14:37:06 +0300 Subject: [PATCH] no need for finality delay to be an Option Signed-off-by: Uncle Stretch --- pallets/networks/Cargo.toml | 2 +- pallets/networks/src/benchmarking.rs | 6 +++--- pallets/networks/src/lib.rs | 8 ++++---- pallets/networks/src/tests.rs | 13 +++++++------ 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pallets/networks/Cargo.toml b/pallets/networks/Cargo.toml index 41787d5..eb7944f 100644 --- a/pallets/networks/Cargo.toml +++ b/pallets/networks/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ghost-networks" -version = "0.1.7" +version = "0.1.8" license.workspace = true authors.workspace = true edition.workspace = true diff --git a/pallets/networks/src/benchmarking.rs b/pallets/networks/src/benchmarking.rs index 7b154bf..70bb6de 100644 --- a/pallets/networks/src/benchmarking.rs +++ b/pallets/networks/src/benchmarking.rs @@ -30,9 +30,9 @@ fn prepare_network( default_endpoint: sp_std::vec![0x69; m as usize], gatekeeper, topic_name, - finality_delay: Some(69), - block_distance: 69, network_type: NetworkType::Evm, + finality_delay: 69, + block_distance: 69, incoming_fee: 0, outgoing_fee: 0, }; @@ -107,7 +107,7 @@ benchmarks! { } update_network_finality_delay { - let delay = Some(1337); + let delay = 1337; let (chain_id, network) = prepare_network::(1, 1); let authority = T::UpdateOrigin::try_successful_origin() .map_err(|_| BenchmarkError::Weightless)?; diff --git a/pallets/networks/src/lib.rs b/pallets/networks/src/lib.rs index c3a6876..596ae65 100644 --- a/pallets/networks/src/lib.rs +++ b/pallets/networks/src/lib.rs @@ -54,8 +54,8 @@ pub struct NetworkData { pub default_endpoint: Vec, pub gatekeeper: Vec, pub topic_name: Vec, - pub finality_delay: Option, pub network_type: NetworkType, + pub finality_delay: u64, pub block_distance: u64, pub incoming_fee: u32, pub outgoing_fee: u32, @@ -157,7 +157,7 @@ pub mod module { NetworkRegistered { chain_id: T::NetworkId, network: NetworkData }, NetworkNameUpdated { chain_id: T::NetworkId, chain_name: Vec }, NetworkEndpointUpdated { chain_id: T::NetworkId, default_endpoint: Vec }, - NetworkFinalityDelayUpdated { chain_id: T::NetworkId, finality_delay: Option }, + NetworkFinalityDelayUpdated { chain_id: T::NetworkId, finality_delay: u64 }, NetworkBlockDistanceUpdated { chain_id: T::NetworkId, block_distance: u64 }, NetworkTypeUpdated { chain_id: T::NetworkId, network_type: NetworkType }, NetworkGatekeeperUpdated { chain_id: T::NetworkId, gatekeeper: Vec }, @@ -293,7 +293,7 @@ pub mod module { pub fn update_network_finality_delay( origin: OriginFor, chain_id: T::NetworkId, - finality_delay: Option, + finality_delay: u64, ) -> DispatchResult { T::UpdateOrigin::ensure_origin_or_root(origin)?; Self::do_update_network_finality_delay( @@ -468,7 +468,7 @@ impl Pallet { /// Update existent network default endpoint. pub fn do_update_network_finality_delay( chain_id: T::NetworkId, - finality_delay: Option, + finality_delay: u64, ) -> DispatchResult { Networks::::try_mutate(&chain_id, |maybe_network| -> DispatchResult { ensure!(maybe_network.is_some(), Error::::NetworkDoesNotExist); diff --git a/pallets/networks/src/tests.rs b/pallets/networks/src/tests.rs index 28a370c..cbedb92 100644 --- a/pallets/networks/src/tests.rs +++ b/pallets/networks/src/tests.rs @@ -11,7 +11,7 @@ fn prepare_network_data() -> (u32, NetworkData) { (1u32, NetworkData { chain_name: "Ethereum".into(), default_endpoint: "https:://some-endpoint.my-server.com/v1/my-super-secret-key".into(), - finality_delay: Some(69), + finality_delay: 69, block_distance: 69, network_type: NetworkType::Evm, gatekeeper: b"0x1234567891234567891234567891234567891234".to_vec(), @@ -119,7 +119,7 @@ fn could_update_network_endpoint_from_authority_account() { fn could_update_network_finality_delay_from_authority_account() { ExtBuilder::build() .execute_with(|| { - let new_finality_delay = Some(1337); + let new_finality_delay = 1337; let (chain_id, network) = prepare_network_data(); register_and_check_network(chain_id, network.clone()); assert_ok!(GhostNetworks::update_network_finality_delay( @@ -311,18 +311,19 @@ fn could_not_update_network_finality_delay_from_random_account() { ExtBuilder::build() .execute_with(|| { let (chain_id, network) = prepare_network_data(); + let finality_delay = 1337; register_and_check_network(chain_id, network.clone()); assert_err!(GhostNetworks::update_network_finality_delay( RuntimeOrigin::signed(RegistererAccount::get()), - chain_id, Some(1337)), + chain_id, finality_delay), DispatchError::BadOrigin); assert_err!(GhostNetworks::update_network_finality_delay( RuntimeOrigin::signed(RemoverAccount::get()), - chain_id, Some(1337)), + chain_id, finality_delay), DispatchError::BadOrigin); assert_err!(GhostNetworks::update_network_finality_delay( RuntimeOrigin::signed(RandomAccount::get()), - chain_id, Some(1337)), + chain_id, finality_delay), DispatchError::BadOrigin); assert_eq!(Networks::::get(chain_id), Some(network)); }); @@ -497,7 +498,7 @@ fn could_not_update_finality_delay_for_non_existent_network() { assert_eq!(Networks::::get(chain_id), None); assert_err!(GhostNetworks::update_network_finality_delay( RuntimeOrigin::signed(UpdaterAccount::get()), - chain_id, Some(1337)), + chain_id, 1337), crate::Error::::NetworkDoesNotExist); assert_eq!(Networks::::get(chain_id), None); });