Merge pull request #821 from opentensor/sam-pallet-index

require explicit pallet indexes
opentensor · Sep 23, 2024 · cdbac35 · cdbac35
2 parents 2069a48 + c428641
commit cdbac35
Show file tree

Hide file tree

Showing 101 changed files with 21,037 additions and 41 deletions.
diff --git a/.github/workflows/check-rust.yml b/.github/workflows/check-rust.yml
@@ -157,9 +157,9 @@ jobs:
 
       - name: check lints
         run: |
-          set -o pipefail  # Ensure the pipeline fails if any command in the pipeline fails
-          cargo check 2>&1 | sed -r "s/\x1B\[[0-9;]*[mK]//g" | tee /dev/tty | grep -q "^warning:" && \
-          (echo "Build emitted the following warnings:" >&2 && exit 1) || echo "No warnings found."
+          set -o pipefail
+          cargo check 2>&1 | sed -r "s/\x1B\[[0-9;]*[mK]//g" | grep "warning:" && exit 1
+          echo "No warnings found."
 
   cargo-clippy-all-features:
     name: cargo clippy --all-features

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,7 +33,9 @@ members = [
     "support/tools",
     "support/macros",
     "support/linting",
+    "support/procedural-fork",
 ]
+exclude = ["support/procedural-fork"]
 resolver = "2"
 
 [workspace.lints.clippy]

diff --git a/build.rs b/build.rs
@@ -60,6 +60,7 @@ fn main() {
         };
 
         track_lint(RequireFreezeStruct::lint(&parsed_file));
+        track_lint(RequireExplicitPalletIndex::lint(&parsed_file));
     });
 
     // Collect and print all errors after the parallel processing is done

diff --git a/pallets/admin-utils/tests/mock.rs b/pallets/admin-utils/tests/mock.rs
@@ -23,11 +23,11 @@ type Block = frame_system::mocking::MockBlock<Test>;
 frame_support::construct_runtime!(
     pub enum Test
     {
-        System: frame_system,
-        Balances: pallet_balances,
-        AdminUtils: pallet_admin_utils,
-        SubtensorModule: pallet_subtensor::{Pallet, Call, Storage, Event<T>, Error<T>},
-        Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>},
+        System: frame_system = 1,
+        Balances: pallet_balances = 2,
+        AdminUtils: pallet_admin_utils = 3,
+        SubtensorModule: pallet_subtensor::{Pallet, Call, Storage, Event<T>, Error<T>} = 4,
+        Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 5,
     }
 );
 

diff --git a/pallets/collective/src/tests.rs b/pallets/collective/src/tests.rs
@@ -36,11 +36,11 @@ pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, u64,
 frame_support::construct_runtime!(
     pub enum Test
     {
-        System: frame_system::{Pallet, Call, Event<T>},
-        Collective: pallet_collective::<Instance1>::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
-        CollectiveMajority: pallet_collective::<Instance2>::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
-        DefaultCollective: pallet_collective::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
-        Democracy: mock_democracy::{Pallet, Call, Event<T>},
+        System: frame_system::{Pallet, Call, Event<T>} = 1,
+        Collective: pallet_collective::<Instance1>::{Pallet, Call, Event<T>, Origin<T>, Config<T>} = 2,
+        CollectiveMajority: pallet_collective::<Instance2>::{Pallet, Call, Event<T>, Origin<T>, Config<T>} = 3,
+        DefaultCollective: pallet_collective::{Pallet, Call, Event<T>, Origin<T>, Config<T>} = 4,
+        Democracy: mock_democracy::{Pallet, Call, Event<T>} = 5,
     }
 );
 mod mock_democracy {

diff --git a/pallets/commitments/src/mock.rs b/pallets/commitments/src/mock.rs
@@ -12,8 +12,8 @@ type Block = frame_system::mocking::MockBlock<Test>;
 frame_support::construct_runtime!(
     pub enum Test
     {
-        System: frame_system,
-        Commitments: pallet_commitments,
+        System: frame_system = 1,
+        Commitments: pallet_commitments = 2,
     }
 );
 

diff --git a/pallets/commitments/src/tests.rs b/pallets/commitments/src/tests.rs
@@ -16,9 +16,9 @@ pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, u64,
 frame_support::construct_runtime!(
     pub enum Test
     {
-        System: frame_system,
-        Balances: pallet_balances,
-        Commitments: pallet_commitments
+        System: frame_system = 1,
+        Balances: pallet_balances = 2,
+        Commitments: pallet_commitments = 3,
     }
 );
 

diff --git a/pallets/registry/src/mock.rs b/pallets/registry/src/mock.rs
@@ -12,8 +12,8 @@ type Block = frame_system::mocking::MockBlock<Test>;
 frame_support::construct_runtime!(
     pub enum Test
     {
-        System: frame_system,
-        TemplateModule: pallet_template,
+        System: frame_system = 1,
+        TemplateModule: pallet_template = 2,
     }
 );
 

diff --git a/pallets/subtensor/tests/mock.rs b/pallets/subtensor/tests/mock.rs
@@ -24,16 +24,16 @@ type Block = frame_system::mocking::MockBlock<Test>;
 frame_support::construct_runtime!(
     pub enum Test
     {
-        System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
-        Balances: pallet_balances::{Pallet, Call, Config<T>, Storage, Event<T>},
-        Triumvirate: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>},
-        TriumvirateMembers: pallet_membership::<Instance1>::{Pallet, Call, Storage, Event<T>, Config<T>},
-        Senate: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>},
-        SenateMembers: pallet_membership::<Instance2>::{Pallet, Call, Storage, Event<T>, Config<T>},
-        SubtensorModule: pallet_subtensor::{Pallet, Call, Storage, Event<T>},
-        Utility: pallet_utility::{Pallet, Call, Storage, Event},
-        Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>},
-        Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>},
+        System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>} = 1,
+        Balances: pallet_balances::{Pallet, Call, Config<T>, Storage, Event<T>} = 2,
+        Triumvirate: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 3,
+        TriumvirateMembers: pallet_membership::<Instance1>::{Pallet, Call, Storage, Event<T>, Config<T>} = 4,
+        Senate: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 5,
+        SenateMembers: pallet_membership::<Instance2>::{Pallet, Call, Storage, Event<T>, Config<T>} = 6,
+        SubtensorModule: pallet_subtensor::{Pallet, Call, Storage, Event<T>} = 7,
+        Utility: pallet_utility::{Pallet, Call, Storage, Event} = 8,
+        Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 9,
+        Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>} = 10,
     }
 );
 

diff --git a/support/linting/Cargo.toml b/support/linting/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 syn.workspace = true
 quote.workspace = true
 proc-macro2.workspace = true
+procedural-fork = { version = "1.10.0-rc3", path = "../procedural-fork" }
 
 [lints]
 workspace = true
diff --git a/support/linting/src/lib.rs b/support/linting/src/lib.rs
@@ -1,6 +1,8 @@
 pub mod lint;
 pub use lint::*;
 
+mod pallet_index;
 mod require_freeze_struct;
 
+pub use pallet_index::RequireExplicitPalletIndex;
 pub use require_freeze_struct::RequireFreezeStruct;