move networkid to constants (#62)

Author: N1ghtStorm

pallets/multisig-verifier/src/lib.rs

@@ -101,6 +101,9 @@ pub mod pallet {
         type MaxPeers: Get<u32>;
 
         type WeightInfo: WeightInfo;
+
+        #[pallet::constant]
+        type ThisNetworkId: Get<GenericNetworkId>;
     }
 
     #[pallet::pallet]
@@ -117,16 +120,6 @@ pub mod pallet {
         OptionQuery,
     >;
 
-    #[pallet::type_value]
-    pub fn DefaultForThisNetworkId() -> GenericNetworkId {
-        GenericNetworkId::Sub(SubNetworkId::Mainnet)
-    }
-
-    #[pallet::storage]
-    #[pallet::getter(fn this_network_id)]
-    pub type ThisNetworkId<T> =
-        StorageValue<_, GenericNetworkId, ValueQuery, DefaultForThisNetworkId>;
-
     #[pallet::event]
     #[pallet::generate_deposit(pub(super) fn deposit_event)]
     pub enum Event<T: Config> {
@@ -154,28 +147,6 @@ pub mod pallet {
     #[pallet::hooks]
     impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
 
-    #[pallet::genesis_config]
-    pub struct GenesisConfig {
-        /// Network id for current network
-        pub network_id: GenericNetworkId,
-    }
-
-    #[cfg(feature = "std")]
-    impl Default for GenesisConfig {
-        fn default() -> Self {
-            Self {
-                network_id: GenericNetworkId::Sub(SubNetworkId::Mainnet),
-            }
-        }
-    }
-
-    #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig {
-        fn build(&self) {
-            ThisNetworkId::<T>::put(self.network_id);
-        }
-    }
-
     #[pallet::call]
     impl<T: Config> Pallet<T> {
         #[pallet::call_index(0)]
@@ -321,7 +292,7 @@ impl<T: Config> bridge_types::traits::Verifier for Pallet<T> {
         commitment_hash: H256,
         proof: &Self::Proof,
     ) -> DispatchResult {
-        let this_network_id = ThisNetworkId::<T>::get();
+        let this_network_id = T::ThisNetworkId::get();
         let digest_hash = Keccak256::hash_of(&proof.digest);
         Self::verify_signatures(network_id, digest_hash, &proof.proof)?;
         let count = proof

pallets/multisig-verifier/src/mock.rs

@@ -56,8 +56,8 @@ frame_support::construct_runtime!(
 parameter_types! {
     pub const BlockHashCount: u64 = 250;
     pub const SS58Prefix: u8 = 42;
-    pub const SidechainRandomnessNetwork: SubNetworkId = SubNetworkId::Mainnet;
     pub const BridgeMaxPeers: u32 = 50;
+    pub const ThisNetworkId: bridge_types::GenericNetworkId = bridge_types::GenericNetworkId::Sub(bridge_types::SubNetworkId::Mainnet);
 }
 
 pub type AccountId = u64;
@@ -95,6 +95,7 @@ impl trusted_verifier::Config for Test {
     type OutboundChannel = TestOutboundChannel;
     type MaxPeers = BridgeMaxPeers;
     type WeightInfo = ();
+    type ThisNetworkId = ThisNetworkId;
 }
 
 pub struct TestOutboundChannel;