Replace system config Index for Nonce (#14290)

* replace Index by Nonce

* replace Index by Nonce

* replace Index by Nonce

* replace Index by Nonce

* replace Index by Nonce

* wip

* remove index in lieu of nonce

* wip

* remove accountnonce in lieu of nonce

* add minor improvement

* rebase and merge conflicts

substrate/frame/alliance/src/mock.rs

@@ -51,7 +51,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;

substrate/frame/asset-conversion/src/mock.rs

@@ -53,7 +53,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u128;

substrate/frame/asset-rate/src/mock.rs

@@ -43,7 +43,7 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;

substrate/frame/assets/src/mock.rs

@@ -52,7 +52,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;

substrate/frame/atomic-swap/src/tests.rs

@@ -27,7 +27,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;

substrate/frame/aura/src/mock.rs

@@ -45,7 +45,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;

substrate/frame/authority-discovery/src/lib.rs

@@ -231,7 +231,7 @@ mod tests {
 		type BlockLength = ();
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
-		type Index = u64;
+		type Nonce = u64;
 		type RuntimeCall = RuntimeCall;
 		type Hash = H256;
 		type Hashing = ::sp_runtime::traits::BlakeTwo256;

substrate/frame/authorship/src/lib.rs

@@ -125,7 +125,7 @@ mod tests {
 		type BlockLength = ();
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
-		type Index = u64;
+		type Nonce = u64;
 		type RuntimeCall = RuntimeCall;
 		type Hash = H256;
 		type Hashing = BlakeTwo256;

substrate/frame/babe/src/mock.rs

@@ -65,7 +65,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Version = ();

substrate/frame/bags-list/src/mock.rs

@@ -52,7 +52,7 @@ impl frame_system::Config for Runtime {
 	type SS58Prefix = ();
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_core::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/balances/src/tests/mod.rs

@@ -92,7 +92,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;

substrate/frame/beefy-mmr/src/mock.rs

@@ -64,7 +64,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;

substrate/frame/beefy/src/mock.rs

@@ -72,7 +72,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;

substrate/frame/benchmarking/pov/src/benchmarking.rs

@@ -342,7 +342,7 @@ mod mock {
 	use sp_runtime::{testing::H256, BuildStorage};
 
 	type AccountId = u64;
-	type AccountIndex = u32;
+	type Nonce = u32;
 
 	type Block = frame_system::mocking::MockBlock<Test>;
 
@@ -360,7 +360,7 @@ mod mock {
 		type BlockLength = ();
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
-		type Index = AccountIndex;
+		type Nonce = Nonce;
 		type RuntimeCall = RuntimeCall;
 		type Hash = H256;
 		type Hashing = ::sp_runtime::traits::BlakeTwo256;

substrate/frame/benchmarking/pov/src/tests.rs

@@ -180,7 +180,7 @@ mod mock {
 		type BlockLength = ();
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
-		type Index = u32;
+		type Nonce = u32;
 		type RuntimeCall = RuntimeCall;
 		type Hash = H256;
 		type Hashing = ::sp_runtime::traits::BlakeTwo256;

substrate/frame/benchmarking/src/baseline.rs

@@ -114,7 +114,7 @@ pub mod mock {
 	use sp_runtime::{testing::H256, BuildStorage};
 
 	type AccountId = u64;
-	type AccountIndex = u32;
+	type Nonce = u32;
 
 	type Block = frame_system::mocking::MockBlock<Test>;
 
@@ -131,7 +131,7 @@ pub mod mock {
 		type BlockLength = ();
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
-		type Index = AccountIndex;
+		type Nonce = Nonce;
 		type RuntimeCall = RuntimeCall;
 		type Hash = H256;
 		type Hashing = ::sp_runtime::traits::BlakeTwo256;

substrate/frame/benchmarking/src/tests.rs

@@ -82,7 +82,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;

substrate/frame/benchmarking/src/tests_instance.rs

@@ -92,7 +92,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;

substrate/frame/bounties/src/tests.rs

@@ -62,7 +62,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;

substrate/frame/child-bounties/src/tests.rs

@@ -65,7 +65,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;

substrate/frame/collective/src/tests.rs

@@ -96,7 +96,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;

substrate/frame/contracts/src/tests.rs

@@ -309,7 +309,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;

substrate/frame/conviction-voting/src/tests.rs

@@ -57,7 +57,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;

substrate/frame/core-fellowship/src/tests.rs

@@ -56,7 +56,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;

substrate/frame/democracy/src/tests.rs

@@ -83,7 +83,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;

substrate/frame/election-provider-multi-phase/src/mock.rs

@@ -208,7 +208,7 @@ impl frame_system::Config for Runtime {
 	type SS58Prefix = ();
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;

substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs

@@ -64,7 +64,7 @@ frame_support::construct_runtime!(
 );
 
 pub(crate) type AccountId = u128;
-pub(crate) type AccountIndex = u32;
+pub(crate) type Nonce = u32;
 pub(crate) type BlockNumber = u64;
 pub(crate) type Balance = u64;
 pub(crate) type VoterIndex = u32;
@@ -77,7 +77,7 @@ impl frame_system::Config for Runtime {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = AccountIndex;
+	type Nonce = Nonce;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/election-provider-support/src/onchain.rs

@@ -190,6 +190,7 @@ mod tests {
 	use sp_npos_elections::Support;
 	use sp_runtime::Perbill;
 	type AccountId = u64;
+	type Nonce = u64;
 	type BlockNumber = u64;
 
 	pub type Header = sp_runtime::generic::Header<BlockNumber, sp_runtime::traits::BlakeTwo256>;
@@ -207,7 +208,7 @@ mod tests {
 		type SS58Prefix = ();
 		type BaseCallFilter = frame_support::traits::Everything;
 		type RuntimeOrigin = RuntimeOrigin;
-		type Index = AccountId;
+		type Nonce = Nonce;
 		type RuntimeCall = RuntimeCall;
 		type Hash = sp_core::H256;
 		type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/elections-phragmen/src/lib.rs

@@ -1323,7 +1323,7 @@ mod tests {
 		type BlockLength = ();
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
-		type Index = u64;
+		type Nonce = u64;
 		type RuntimeCall = RuntimeCall;
 		type Hash = H256;
 		type Hashing = BlakeTwo256;

substrate/frame/examples/basic/src/tests.rs

@@ -51,7 +51,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;

substrate/frame/examples/default-config/src/lib.rs

@@ -137,7 +137,7 @@ pub mod tests {
 
 		// all of this is coming from `frame_system::config_preludes::TestDefaultConfig`.
 
-		// type Index = u32;
+		// type Nonce = u32;
 		// type BlockNumber = u32;
 		// type Header =
 		// sp_runtime::generic::Header<frame_system::pallet_prelude::BlockNumberFor<Self>,

substrate/frame/examples/dev-mode/src/tests.rs

@@ -45,7 +45,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;

substrate/frame/examples/offchain-worker/src/tests.rs

@@ -53,7 +53,7 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = sp_core::sr25519::Public;

substrate/frame/executive/src/lib.rs

@@ -868,7 +868,7 @@ mod tests {
 		type BlockLength = ();
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
-		type Index = u64;
+		type Nonce = u64;
 		type RuntimeCall = RuntimeCall;
 		type Hash = sp_core::H256;
 		type Hashing = BlakeTwo256;

substrate/frame/fast-unstake/src/mock.rs

@@ -32,7 +32,7 @@ use pallet_staking::{Exposure, IndividualExposure, StakerStatus};
 use sp_std::prelude::*;
 
 pub type AccountId = u128;
-pub type AccountIndex = u32;
+pub type Nonce = u32;
 pub type BlockNumber = u64;
 pub type Balance = u128;
 pub type T = Runtime;
@@ -50,7 +50,7 @@ impl frame_system::Config for Runtime {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = AccountIndex;
+	type Nonce = Nonce;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_core::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/glutton/src/mock.rs

@@ -44,7 +44,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;

substrate/frame/grandpa/src/mock.rs

@@ -69,7 +69,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/identity/src/tests.rs

@@ -49,7 +49,7 @@ impl frame_system::Config for Test {
 	type BlockWeights = ();
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;

substrate/frame/im-online/src/mock.rs

@@ -119,7 +119,7 @@ impl frame_system::Config for Runtime {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;

substrate/frame/indices/src/mock.rs

@@ -42,7 +42,7 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;
 	type AccountId = u64;

substrate/frame/insecure-randomness-collective-flip/src/lib.rs

@@ -195,7 +195,7 @@ mod tests {
 		type BlockLength = BlockLength;
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
-		type Index = u64;
+		type Nonce = u64;
 		type RuntimeCall = RuntimeCall;
 		type Hash = H256;
 		type Hashing = BlakeTwo256;

substrate/frame/lottery/src/mock.rs

@@ -53,7 +53,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;

substrate/frame/membership/src/lib.rs

@@ -556,7 +556,7 @@ mod tests {
 		type BlockLength = ();
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
-		type Index = u64;
+		type Nonce = u64;
 		type Hash = H256;
 		type RuntimeCall = RuntimeCall;
 		type Hashing = BlakeTwo256;

substrate/frame/merkle-mountain-range/src/mock.rs

@@ -41,7 +41,7 @@ impl frame_system::Config for Test {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = sp_core::sr25519::Public;

substrate/frame/message-queue/src/integration_test.rs

@@ -56,7 +56,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;

substrate/frame/message-queue/src/mock.rs

@@ -49,7 +49,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;

substrate/frame/multisig/src/tests.rs

@@ -49,7 +49,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;

substrate/frame/nft-fractionalization/src/mock.rs

@@ -55,7 +55,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;

substrate/frame/nfts/src/mock.rs

@@ -52,7 +52,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;

substrate/frame/nicks/src/lib.rs

@@ -260,7 +260,7 @@ mod tests {
 		type BlockLength = ();
 		type DbWeight = ();
 		type RuntimeOrigin = RuntimeOrigin;
-		type Index = u64;
+		type Nonce = u64;
 		type Hash = H256;
 		type RuntimeCall = RuntimeCall;
 		type Hashing = BlakeTwo256;

substrate/frame/nis/src/mock.rs

@@ -56,7 +56,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;

substrate/frame/node-authorization/src/mock.rs

@@ -49,7 +49,7 @@ impl frame_system::Config for Test {
 	type BlockWeights = ();
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;

substrate/frame/nomination-pools/benchmarking/src/mock.rs

@@ -24,7 +24,7 @@ use sp_runtime::{
 };
 
 type AccountId = u128;
-type AccountIndex = u32;
+type Nonce = u32;
 type BlockNumber = u64;
 type Balance = u128;
 
@@ -34,7 +34,7 @@ impl frame_system::Config for Runtime {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = AccountIndex;
+	type Nonce = Nonce;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_core::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/nomination-pools/src/mock.rs

@@ -168,7 +168,7 @@ impl frame_system::Config for Runtime {
 	type SS58Prefix = ();
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_core::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/nomination-pools/test-staking/src/mock.rs

@@ -29,7 +29,7 @@ use sp_runtime::{
 };
 
 type AccountId = u128;
-type AccountIndex = u32;
+type Nonce = u32;
 type BlockNumber = u64;
 type Balance = u128;
 
@@ -44,7 +44,7 @@ impl frame_system::Config for Runtime {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = AccountIndex;
+	type Nonce = Nonce;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_core::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/offences/benchmarking/src/mock.rs

@@ -34,7 +34,7 @@ use sp_runtime::{
 };
 
 type AccountId = u64;
-type AccountIndex = u32;
+type Nonce = u32;
 type Balance = u64;
 
 impl frame_system::Config for Test {
@@ -43,7 +43,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = AccountIndex;
+	type Nonce = Nonce;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_core::H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;

substrate/frame/offences/src/mock.rs

@@ -81,7 +81,7 @@ impl frame_system::Config for Runtime {
 	type BlockLength = ();
 	type DbWeight = RocksDbWeight;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;

substrate/frame/preimage/src/mock.rs

@@ -50,7 +50,7 @@ impl frame_system::Config for Test {
 	type DbWeight = RocksDbWeight;
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;

substrate/frame/proxy/src/tests.rs

@@ -53,7 +53,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;

substrate/frame/ranked-collective/src/tests.rs

@@ -51,7 +51,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;

substrate/frame/recovery/src/mock.rs

@@ -48,7 +48,7 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;

substrate/frame/referenda/src/mock.rs

@@ -65,7 +65,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;

substrate/frame/remark/src/mock.rs

@@ -42,7 +42,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;

substrate/frame/root-offences/src/mock.rs

@@ -87,7 +87,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;

substrate/frame/salary/src/tests.rs

@@ -55,7 +55,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;

substrate/frame/scheduler/src/mock.rs

@@ -125,7 +125,7 @@ impl system::Config for Test {
 	type DbWeight = RocksDbWeight;
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;

substrate/frame/scored-pool/src/mock.rs

@@ -56,7 +56,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;

substrate/frame/session/benchmarking/src/mock.rs

@@ -27,7 +27,7 @@ use frame_support::{
 use sp_runtime::{traits::IdentityLookup, BuildStorage};
 
 type AccountId = u64;
-type AccountIndex = u32;
+type Nonce = u32;
 type Balance = u64;
 
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -48,7 +48,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = AccountIndex;
+	type Nonce = Nonce;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_core::H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;

substrate/frame/session/src/mock.rs

@@ -238,7 +238,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;

substrate/frame/society/src/mock.rs

@@ -64,7 +64,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type RuntimeCall = RuntimeCall;
 	type Hashing = BlakeTwo256;

substrate/frame/staking/src/mock.rs

@@ -43,7 +43,7 @@ pub const BLOCK_TIME: u64 = 1000;
 
 /// The AccountId alias in this test module.
 pub(crate) type AccountId = u64;
-pub(crate) type AccountIndex = u64;
+pub(crate) type Nonce = u64;
 pub(crate) type BlockNumber = u64;
 pub(crate) type Balance = u128;
 
@@ -124,7 +124,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = RocksDbWeight;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = AccountIndex;
+	type Nonce = Nonce;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;

substrate/frame/state-trie-migration/src/lib.rs

@@ -1087,7 +1087,7 @@ mod mock {
 		type BlockLength = ();
 		type RuntimeOrigin = RuntimeOrigin;
 		type RuntimeCall = RuntimeCall;
-		type Index = u64;
+		type Nonce = u64;
 		type Hash = H256;
 		type Hashing = BlakeTwo256;
 		type AccountId = u64;

substrate/frame/statement/src/mock.rs

@@ -54,7 +54,7 @@ impl frame_system::Config for Test {
 	type DbWeight = RocksDbWeight;
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId32;

substrate/frame/sudo/src/mock.rs

@@ -115,7 +115,7 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = u64;
+	type Nonce = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;

substrate/frame/support/procedural/src/lib.rs

@@ -873,7 +873,7 @@ pub fn storage_alias(_: TokenStream, input: TokenStream) -> TokenStream {
 ///     type BlockWeights = ();
 ///     type BlockLength = ();
 ///     type DbWeight = ();
-///     type Index = u64;
+///     type Nonce = u64;
 ///     type BlockNumber = u64;
 ///     type Hash = sp_core::hash::H256;
 ///     type Hashing = sp_runtime::traits::BlakeTwo256;
@@ -908,7 +908,7 @@ pub fn storage_alias(_: TokenStream, input: TokenStream) -> TokenStream {
 ///     type BlockWeights = <TestDefaultConfig as DefaultConfig>::BlockWeights;
 ///     type BlockLength = <TestDefaultConfig as DefaultConfig>::BlockLength;
 ///     type DbWeight = <TestDefaultConfig as DefaultConfig>::DbWeight;
-///     type Index = <TestDefaultConfig as DefaultConfig>::Index;
+///     type Nonce = <TestDefaultConfig as DefaultConfig>::Nonce;
 ///     type BlockNumber = <TestDefaultConfig as DefaultConfig>::BlockNumber;
 ///     type Hash = <TestDefaultConfig as DefaultConfig>::Hash;
 ///     type Hashing = <TestDefaultConfig as DefaultConfig>::Hashing;

substrate/frame/support/test/compile_pass/src/lib.rs

@@ -45,7 +45,6 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 pub type Signature = sr25519::Signature;
 pub type AccountId = <Signature as Verify>::Signer;
 pub type BlockNumber = u64;
-pub type Index = u64;
 
 parameter_types! {
 	pub const Version: RuntimeVersion = VERSION;
@@ -55,7 +54,7 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
-	type Index = u128;
+	type Nonce = u128;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type Block = Block;

substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs

@@ -22,7 +22,7 @@ impl pallet::Config for Runtime {}
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.rs

@@ -1,6 +1,6 @@
 use frame_support::construct_runtime;
-use sp_runtime::{generic, traits::BlakeTwo256};
 use sp_core::sr25519;
+use sp_runtime::{generic, traits::BlakeTwo256};
 
 #[frame_support::pallet]
 mod pallet {
@@ -18,22 +18,22 @@ mod pallet {
 
 #[derive(scale_info::TypeInfo, frame_support::PalletError, codec::Encode, codec::Decode)]
 pub enum Nested1 {
-	Nested2(Nested2)
+	Nested2(Nested2),
 }
 
 #[derive(scale_info::TypeInfo, frame_support::PalletError, codec::Encode, codec::Decode)]
 pub enum Nested2 {
-	Nested3(Nested3)
+	Nested3(Nested3),
 }
 
 #[derive(scale_info::TypeInfo, frame_support::PalletError, codec::Encode, codec::Decode)]
 pub enum Nested3 {
-	Nested4(Nested4)
+	Nested4(Nested4),
 }
 
 #[derive(scale_info::TypeInfo, frame_support::PalletError, codec::Encode, codec::Decode)]
 pub enum Nested4 {
-	Num(u8)
+	Num(u8),
 }
 
 pub type Signature = sr25519::Signature;
@@ -47,7 +47,7 @@ impl pallet::Config for Runtime {}
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs

@@ -1,6 +1,6 @@
 use frame_support::construct_runtime;
-use sp_runtime::{generic, traits::BlakeTwo256};
 use sp_core::sr25519;
+use sp_runtime::{generic, traits::BlakeTwo256};
 
 #[frame_support::pallet]
 mod pallet {
@@ -22,7 +22,7 @@ impl pallet::Config for Runtime {}
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs

@@ -1,6 +1,6 @@
 use frame_support::construct_runtime;
-use sp_runtime::{generic, traits::BlakeTwo256};
 use sp_core::sr25519;
+use sp_runtime::{generic, traits::BlakeTwo256};
 
 #[frame_support::pallet]
 mod pallet {
@@ -22,7 +22,7 @@ impl pallet::Config for Runtime {}
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs

@@ -1,6 +1,6 @@
 use frame_support::construct_runtime;
-use sp_runtime::{generic, traits::BlakeTwo256};
 use sp_core::sr25519;
+use sp_runtime::{generic, traits::BlakeTwo256};
 
 #[frame_support::pallet]
 mod pallet {
@@ -22,7 +22,7 @@ impl pallet::Config for Runtime {}
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs

@@ -1,6 +1,6 @@
 use frame_support::construct_runtime;
-use sp_runtime::{generic, traits::BlakeTwo256};
 use sp_core::sr25519;
+use sp_runtime::{generic, traits::BlakeTwo256};
 
 #[frame_support::pallet]
 mod pallet {
@@ -22,7 +22,7 @@ impl pallet::Config for Runtime {}
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs

@@ -1,6 +1,6 @@
 use frame_support::construct_runtime;
-use sp_runtime::{generic, traits::BlakeTwo256};
 use sp_core::sr25519;
+use sp_runtime::{generic, traits::BlakeTwo256};
 
 #[frame_support::pallet]
 mod pallet {
@@ -22,7 +22,7 @@ impl pallet::Config for Runtime {}
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs

@@ -22,7 +22,7 @@ impl pallet::Config for Runtime {}
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/support/test/tests/pallet.rs

@@ -656,7 +656,7 @@ frame_support::parameter_types!(
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/support/test/tests/pallet_instance.rs

@@ -291,7 +291,7 @@ pub mod pallet2 {
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/support/test/tests/pallet_ui/pallet_doc_arg_non_path.rs

@@ -5,7 +5,7 @@ mod pallet {
 	#[pallet::config]
 	pub trait Config: frame_system::Config
 	where
-		<Self as frame_system::Config>::Index: From<u128>,
+		<Self as frame_system::Config>::Nonce: From<u128>,
 	{
 	}
 

substrate/frame/support/test/tests/pallet_ui/pallet_doc_empty.rs

@@ -5,7 +5,7 @@ mod pallet {
 	#[pallet::config]
 	pub trait Config: frame_system::Config
 	where
-		<Self as frame_system::Config>::Index: From<u128>,
+		<Self as frame_system::Config>::Nonce: From<u128>,
 	{
 	}
 

substrate/frame/support/test/tests/pallet_ui/pallet_doc_invalid_arg.rs

@@ -5,7 +5,7 @@ mod pallet {
 	#[pallet::config]
 	pub trait Config: frame_system::Config
 	where
-		<Self as frame_system::Config>::Index: From<u128>,
+		<Self as frame_system::Config>::Nonce: From<u128>,
 	{
 	}
 

substrate/frame/support/test/tests/pallet_ui/pallet_doc_multiple_args.rs

@@ -5,7 +5,7 @@ mod pallet {
 	#[pallet::config]
 	pub trait Config: frame_system::Config
 	where
-		<Self as frame_system::Config>::Index: From<u128>,
+		<Self as frame_system::Config>::Nonce: From<u128>,
 	{
 	}
 

substrate/frame/support/test/tests/pallet_ui/pass/dev_mode_valid.rs

@@ -1,10 +1,6 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use frame_support::{
-	traits::{
-		ConstU32,
-	},
-};
+use frame_support::traits::ConstU32;
 
 pub use pallet::*;
 
@@ -60,7 +56,7 @@ pub mod pallet {
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
@@ -96,17 +92,15 @@ frame_support::construct_runtime!(
 	}
 );
 
-impl pallet::Config for Runtime {
-	
-}
+impl pallet::Config for Runtime {}
 
 fn main() {
-	use frame_support::{pallet_prelude::*};
-	use storage::unhashed;
+	use frame_support::pallet_prelude::*;
 	use sp_io::{
 		hashing::{blake2_128, twox_128},
 		TestExternalities,
 	};
+	use storage::unhashed;
 
 	fn blake2_128_concat(d: &[u8]) -> Vec<u8> {
 		let mut v = blake2_128(d).to_vec();

substrate/frame/support/test/tests/pallet_ui/pass/no_std_genesis_config.rs

@@ -1,6 +1,6 @@
 use frame_support::construct_runtime;
-use sp_runtime::{generic, traits::BlakeTwo256};
 use sp_core::sr25519;
+use sp_runtime::{generic, traits::BlakeTwo256};
 
 pub type Signature = sr25519::Signature;
 pub type BlockNumber = u32;
@@ -13,7 +13,7 @@ impl test_pallet::Config for Runtime {}
 impl frame_system::Config for Runtime {
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/support/test/tests/pallet_ui/pass/where_clause_missing_hooks.rs

@@ -1,17 +1,24 @@
 #[frame_support::pallet]
 mod pallet {
 	#[pallet::config]
-	pub trait Config: frame_system::Config where <Self as frame_system::Config>::Index: From<u128> {}
+	pub trait Config: frame_system::Config
+	where
+		<Self as frame_system::Config>::Nonce: From<u128>,
+	{
+	}
 
 	#[pallet::pallet]
 	pub struct Pallet<T>(core::marker::PhantomData<T>);
 
 	#[pallet::call]
-	impl<T: Config> Pallet<T> where <T as frame_system::Config>::Index: From<u128> {}
+	impl<T: Config> Pallet<T> where <T as frame_system::Config>::Nonce: From<u128> {}
 
-	impl<T: Config> Pallet<T> where <T as frame_system::Config>::Index: From<u128> {
+	impl<T: Config> Pallet<T>
+	where
+		<T as frame_system::Config>::Nonce: From<u128>,
+	{
 		fn foo(x: u128) {
-			let _index = <T as frame_system::Config>::Index::from(x);
+			let _index = <T as frame_system::Config>::Nonce::from(x);
 		}
 	}
 }

substrate/frame/support/test/tests/runtime_metadata.rs

@@ -25,7 +25,6 @@ use scale_info::{form::MetaForm, meta_type};
 use sp_runtime::traits::Block as BlockT;
 
 pub type BlockNumber = u64;
-pub type Index = u64;
 pub type Header = sp_runtime::generic::Header<u32, sp_runtime::traits::BlakeTwo256>;
 pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, RuntimeCall, (), ()>;
@@ -36,7 +35,7 @@ impl frame_system::Config for Runtime {
 	type DbWeight = ();
 	type BaseCallFilter = frame_support::traits::Everything;
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;

substrate/frame/support/test/tests/storage_layers.rs

@@ -58,7 +58,7 @@ pub mod pallet {
 }
 
 pub type BlockNumber = u32;
-pub type Index = u64;
+pub type Nonce = u64;
 pub type AccountId = u64;
 pub type Header = sp_runtime::generic::Header<BlockNumber, sp_runtime::traits::BlakeTwo256>;
 pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, RuntimeCall, (), ()>;
@@ -70,7 +70,7 @@ impl frame_system::Config for Runtime {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
-	type Index = Index;
+	type Nonce = Nonce;
 	type Hash = sp_runtime::testing::H256;
 	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type AccountId = AccountId;

substrate/frame/system/README.md

@@ -33,7 +33,7 @@ The System module defines the following extensions:
   - [`CheckWeight`]: Checks the weight and length of the block and ensure that it does not
     exceed the limits.
   - [`CheckNonce`]: Checks the nonce of the transaction. Contains a single payload of type
-    `T::Index`.
+    `T::Nonce`.
   - [`CheckEra`]: Checks the era of the transaction. Contains a single payload of type `Era`.
   - [`CheckGenesis`]: Checks the provided genesis hash of the transaction. Must be a part of the
     signed payload of the transaction.

substrate/frame/system/benches/bench.rs

@@ -63,7 +63,7 @@ impl frame_system::Config for Runtime {
 	type BlockLength = BlockLength;
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
+	type Nonce = u64;
 	type RuntimeCall = RuntimeCall;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;

substrate/frame/system/benchmarking/src/mock.rs

@@ -23,7 +23,7 @@ use codec::Encode;
 use sp_runtime::{traits::IdentityLookup, BuildStorage};
 
 type AccountId = u64;
-type AccountIndex = u32;
+type Nonce = u32;
 
 type Block = frame_system::mocking::MockBlock<Test>;
 
@@ -40,7 +40,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
-	type Index = AccountIndex;
+	type Nonce = Nonce;
 	type RuntimeCall = RuntimeCall;
 	type Hash = sp_core::H256;
 	type Hashing = ::sp_runtime::traits::BlakeTwo256;

substrate/frame/system/rpc/runtime-api/src/lib.rs

@@ -24,12 +24,12 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 sp_api::decl_runtime_apis! {
-	/// The API to query account nonce (aka transaction index).
-	pub trait AccountNonceApi<AccountId, Index> where
+	/// The API to query account nonce.
+	pub trait AccountNonceApi<AccountId, Nonce> where
 		AccountId: codec::Codec,
-		Index: codec::Codec,
+		Nonce: codec::Codec,
 	{
 		/// Get current account nonce of given `AccountId`.
-		fn account_nonce(account: AccountId) -> Index;
+		fn account_nonce(account: AccountId) -> Nonce;
 	}
 }

substrate/frame/system/src/extensions/check_nonce.rs

@@ -37,11 +37,11 @@ use sp_std::vec;
 /// some kind of priority upon validating transactions.
 #[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)]
 #[scale_info(skip_type_params(T))]
-pub struct CheckNonce<T: Config>(#[codec(compact)] pub T::Index);
+pub struct CheckNonce<T: Config>(#[codec(compact)] pub T::Nonce);
 
 impl<T: Config> CheckNonce<T> {
 	/// utility constructor. Used only in client/factory code.
-	pub fn from(nonce: T::Index) -> Self {
+	pub fn from(nonce: T::Nonce) -> Self {
 		Self(nonce)
 	}
 }
@@ -88,7 +88,7 @@ where
 			}
 			.into())
 		}
-		account.nonce += T::Index::one();
+		account.nonce += T::Nonce::one();
 		crate::Account::<T>::insert(who, account);
 		Ok(())
 	}