replace _otf with _subtensor_

Author: liamaharon

Cargo.lock

@@ -50,7 +50,7 @@ useless_conversion = "allow"     # until polkadot is patched
 [workspace.dependencies]
 node-subtensor-runtime = { path = "runtime", default-features = false }
 pallet-admin-utils = { path = "pallets/admin-utils", default-features = false }
-pallet-collective-otf = { path = "pallets/collective", default-features = false }
+pallet-subtensor-collective = { path = "pallets/collective", default-features = false }
 pallet-commitments = { path = "pallets/commitments", default-features = false }
 pallet-registry = { path = "pallets/registry", default-features = false }
 pallet-crowdloan = { path = "pallets/crowdloan", default-features = false }
@@ -124,8 +124,8 @@ frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-s
 frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503-6", default-features = false }
 frame-metadata = { version = "20.0.0", default-features = false }
 
-pallet-proxy-otf = { path = "pallets/proxy", default-features = false }
-pallet-utility-otf = { path = "pallets/utility", default-features = false }
+pallet-subtensor-proxy = { path = "pallets/proxy", default-features = false }
+pallet-subtensor-utility = { path = "pallets/utility", default-features = false }
 pallet-babe = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503-6", default-features = false }
 pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503-6", default-features = false }
 pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503-6", default-features = false }

Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "pallet-collective-otf"
+name = "pallet-subtensor-collective"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <[email protected]>, Opentensor Technologies"]
 edition.workspace = true

pallets/collective/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "pallet-proxy-otf"
+name = "pallet-subtensor-proxy"
 version = "38.0.0"
 authors = ["Bittensor Nucleus Team"]
 edition.workspace = true
@@ -26,7 +26,7 @@ subtensor-macros.workspace = true
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
-pallet-utility-otf = { workspace = true, default-features = true }
+pallet-subtensor-utility = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 
 [features]
@@ -46,12 +46,12 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"pallet-utility-otf/runtime-benchmarks",
+	"pallet-subtensor-utility/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"sp-runtime/try-runtime",
 	"pallet-balances/try-runtime",
-	"pallet-utility-otf/try-runtime",
+	"pallet-subtensor-utility/try-runtime",
 ]

pallets/proxy/Cargo.toml

@@ -133,8 +133,8 @@ impl Config for Test {
 use super::{Call as ProxyCall, Event as ProxyEvent};
 use frame_system::Call as SystemCall;
 use pallet_balances::{Call as BalancesCall, Event as BalancesEvent};
-use pallet_utility_otf as pallet_utility;
-use pallet_utility_otf::{Call as UtilityCall, Event as UtilityEvent};
+use pallet_subtensor_utility as pallet_utility;
+use pallet_subtensor_utility::{Call as UtilityCall, Event as UtilityEvent};
 
 type SystemError = frame_system::Error<Test>;
 

pallets/proxy/src/tests.rs

@@ -33,7 +33,7 @@ libsecp256k1.workspace = true
 log.workspace = true
 substrate-fixed.workspace = true
 pallet-transaction-payment.workspace = true
-pallet-utility-otf.workspace = true
+pallet-subtensor-utility.workspace = true
 ndarray.workspace = true
 hex.workspace = true
 share-pool.workspace = true
@@ -44,7 +44,7 @@ runtime-common.workspace = true
 subtensor-runtime-common = { workspace = true, features = ["approx"] }
 
 pallet-drand.workspace = true
-pallet-collective-otf.workspace = true
+pallet-subtensor-collective.workspace = true
 pallet-membership.workspace = true
 hex-literal.workspace = true
 num-traits = { workspace = true, features = ["libm"] }
@@ -54,7 +54,7 @@ w3f-bls.workspace = true
 sha2.workspace = true
 rand_chacha.workspace = true
 pallet-crowdloan.workspace = true
-pallet-proxy-otf.workspace = true
+pallet-subtensor-proxy.workspace = true
 
 [dev-dependencies]
 pallet-balances = { workspace = true, features = ["std"] }
@@ -81,14 +81,14 @@ std = [
 	"log/std",
 	"num-traits/std",
 	"pallet-balances/std",
-	"pallet-collective-otf/std",
+	"pallet-subtensor-collective/std",
 	"pallet-drand/std",
 	"pallet-membership/std",
 	"pallet-preimage/std",
 	"pallet-scheduler/std",
 	"pallet-subtensor-swap/std",
 	"pallet-transaction-payment/std",
-	"pallet-utility-otf/std",
+	"pallet-subtensor-utility/std",
 	"rand_chacha/std",
 	"safe-math/std",
 	"scale-info/std",
@@ -113,29 +113,29 @@ std = [
 	"sha2/std",
 	"share-pool/std",
 	"subtensor-runtime-common/std",
-	"pallet-proxy-otf/std",
+	"pallet-subtensor-proxy/std",
 	"pallet-crowdloan/std",
 	"runtime-common/std",
-	"ndarray/std"
+	"ndarray/std",
 ]
 default = ["std"]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"pallet-collective-otf/runtime-benchmarks",
+	"pallet-subtensor-collective/runtime-benchmarks",
 	"pallet-drand/runtime-benchmarks",
 	"pallet-membership/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-scheduler/runtime-benchmarks",
 	"pallet-subtensor-swap/runtime-benchmarks",
 	"pallet-transaction-payment/runtime-benchmarks",
-	"pallet-proxy-otf/runtime-benchmarks",
+	"pallet-subtensor-proxy/runtime-benchmarks",
 	"pallet-crowdloan/runtime-benchmarks",
-	"pallet-utility-otf/runtime-benchmarks",
+	"pallet-subtensor-utility/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"runtime-common/runtime-benchmarks"
+	"runtime-common/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
@@ -145,13 +145,13 @@ try-runtime = [
 	"pallet-preimage/try-runtime",
 	"pallet-scheduler/try-runtime",
 	"pallet-transaction-payment/try-runtime",
-	"pallet-utility-otf/try-runtime",
+	"pallet-subtensor-utility/try-runtime",
 	"sp-runtime/try-runtime",
-	"pallet-collective-otf/try-runtime",
+	"pallet-subtensor-collective/try-runtime",
 	"pallet-drand/try-runtime",
-	"pallet-proxy-otf/try-runtime",
+	"pallet-subtensor-proxy/try-runtime",
 	"pallet-crowdloan/try-runtime",
-	"runtime-common/try-runtime"
+	"runtime-common/try-runtime",
 ]
 pow-faucet = []
 fast-runtime = ["subtensor-runtime-common/fast-runtime"]

pallets/subtensor/Cargo.toml

@@ -4,7 +4,7 @@ use frame_support::{
     traits::{Contains, Currency},
 };
 use frame_system::Config;
-use pallet_utility_otf as pallet_utility;
+use pallet_subtensor_utility as pallet_utility;
 use sp_core::U256;
 
 // SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --package pallet-subtensor --lib -- tests::batch_tx::test_batch_txs --exact --show-output --nocapture

pallets/subtensor/src/tests/batch_tx.rs

@@ -15,9 +15,9 @@ use frame_support::{
 };
 use frame_system as system;
 use frame_system::{EnsureNever, EnsureRoot, RawOrigin, limits, offchain::CreateTransactionBase};
-use pallet_collective_otf as pallet_collective;
-use pallet_collective_otf::MemberCount;
-use pallet_utility_otf as pallet_utility;
+use pallet_subtensor_collective as pallet_collective;
+use pallet_subtensor_collective::MemberCount;
+use pallet_subtensor_utility as pallet_utility;
 use sp_core::{ConstU64, Get, H256, U256, offchain::KeyTypeId};
 use sp_runtime::Perbill;
 use sp_runtime::{