fix: testnet compatibility

renlabs-dev · Nov 13, 2024 · 2b218d4 · 2b218d4
1 parent 14deb82
commit 2b218d4
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 41 deletions.
diff --git a/pallets/offworker/Cargo.toml b/pallets/offworker/Cargo.toml
@@ -28,6 +28,7 @@ std = [
 ]
 try-runtime = ["frame-support/try-runtime"]
 testing-offworker = []
+testnet = []
 
 [dependencies]
 pallet-subnet-emission = { path = "../subnet_emission", default-features = false }

diff --git a/pallets/subnet_emission/src/lib.rs b/pallets/subnet_emission/src/lib.rs
@@ -49,8 +49,11 @@ pub mod pallet {
     use subnet_pricing::root::RootPricing;
     use types::KeylessBlockWeights;
 
-    pub const STORAGE_VERSION: frame_support::traits::StorageVersion =
-        frame_support::traits::StorageVersion::new(0);
+    #[cfg(feature = "testnet")]
+    const STORAGE_VERSION: StorageVersion = StorageVersion::new(12);
+
+    #[cfg(not(feature = "testnet"))]
+    const STORAGE_VERSION: StorageVersion = StorageVersion::new(0);
 
     #[pallet::pallet]
     #[pallet::storage_version(STORAGE_VERSION)]

diff --git a/pallets/subspace/src/lib.rs b/pallets/subspace/src/lib.rs
@@ -56,19 +56,12 @@ pub use crate::params::{
 };
 use selections::{config, dispatches, errors, events, genesis, hooks};
 
-#[cfg(not(feature = "testnet"))]
-use selections::storage_v_mainnet as storage_v;
-
-#[cfg(feature = "testnet")]
-use selections::storage_v_testnet as storage_v;
-
 #[import_section(genesis::genesis)]
 #[import_section(errors::errors)]
 #[import_section(events::events)]
 #[import_section(dispatches::dispatches)]
 #[import_section(hooks::hooks)]
 #[import_section(config::config)]
-#[import_section(storage_v::storage_version)]
 #[frame_support::pallet]
 pub mod pallet {
     #![allow(deprecated, clippy::let_unit_value, clippy::too_many_arguments)]
@@ -92,6 +85,17 @@ pub mod pallet {
 
     pub type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
 
+    #[cfg(feature = "testnet")]
+    const STORAGE_VERSION: StorageVersion = StorageVersion::new(31);
+
+    #[cfg(not(feature = "testnet"))]
+    const STORAGE_VERSION: StorageVersion = StorageVersion::new(14);
+
+    #[pallet::pallet]
+    #[pallet::storage_version(STORAGE_VERSION)]
+    #[pallet::without_storage_info]
+    pub struct Pallet<T>(_);
+
     // --- Subnet Storage ---
     define_subnet_includes!(
         double_maps: {

diff --git a/pallets/subspace/src/selections/mod.rs b/pallets/subspace/src/selections/mod.rs
@@ -4,7 +4,3 @@ pub mod errors;
 pub mod events;
 pub mod genesis;
 pub mod hooks;
-#[cfg(not(feature = "testnet"))]
-pub mod storage_v_mainnet;
-#[cfg(feature = "testnet")]
-pub mod storage_v_testnet;
diff --git a/pallets/subspace/src/selections/storage_v.rs b/pallets/subspace/src/selections/storage_v.rs
diff --git a/pallets/subspace/src/selections/storage_v_mainnet.rs b/pallets/subspace/src/selections/storage_v_mainnet.rs
diff --git a/pallets/subspace/src/selections/storage_v_testnet.rs b/pallets/subspace/src/selections/storage_v_testnet.rs
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -89,7 +89,13 @@ substrate-wasm-builder = { workspace = true, optional = true }
 [features]
 default = ["std"]
 testnet-faucet = ["pallet-faucet"]
-testnet = []
+testnet = [
+    "pallet-subspace/testnet",
+    "pallet-governance/testnet",
+    "pallet-offworker/testnet",
+    "pallet-subnet-emission/testnet",
+    "pallet-faucet/testnet",
+]
 std = [
     "frame-try-runtime?/std",
     "frame-system-benchmarking?/std",