Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ 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-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 }
Expand Down Expand Up @@ -136,7 +135,6 @@ pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "p
pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503-6", default-features = false }
pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503-6", default-features = false }
pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503-6", default-features = false }
pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503-6", default-features = false }
pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503-6", default-features = false }
pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503-6", default-features = false }
pallet-safe-mode = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2503-6", default-features = false }
Expand Down
18 changes: 0 additions & 18 deletions node/src/chain_spec/localnet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,6 @@ fn localnet_genesis(
}
}

let trimvirate_members: Vec<AccountId> = bounded_vec![
get_account_id_from_seed::<sr25519::Public>("Alice"),
get_account_id_from_seed::<sr25519::Public>("Bob"),
get_account_id_from_seed::<sr25519::Public>("Charlie"),
];

let senate_members: Vec<AccountId> = bounded_vec![
get_account_id_from_seed::<sr25519::Public>("Dave"),
get_account_id_from_seed::<sr25519::Public>("Eve"),
get_account_id_from_seed::<sr25519::Public>("Ferdie"),
];

serde_json::json!({
"balances": { "balances": balances },
"aura": {
Expand All @@ -125,12 +113,6 @@ fn localnet_genesis(
"sudo": {
"key": Some(get_account_id_from_seed::<sr25519::Public>("Alice"))
},
"triumvirateMembers": {
"members": trimvirate_members
},
"senateMembers": {
"members": senate_members,
},
"evmChainId": {
"chainId": 42,
},
Expand Down
2 changes: 1 addition & 1 deletion node/src/chain_spec/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use sc_service::ChainType;
use sp_consensus_aura::sr25519::AuthorityId as AuraId;
use sp_consensus_grandpa::AuthorityId as GrandpaId;
use sp_core::crypto::Ss58Codec;
use sp_core::{H256, Pair, Public, bounded_vec, sr25519};
use sp_core::{H256, Pair, Public, sr25519};
use sp_runtime::AccountId32;
use sp_runtime::traits::{IdentifyAccount, Verify};
use std::collections::HashSet;
Expand Down
7 changes: 1 addition & 6 deletions pallets/admin-utils/src/tests/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use frame_support::{
traits::{Everything, Hooks, InherentBuilder, PrivilegeCmp},
};
use frame_system::{self as system, offchain::CreateTransactionBase};
use frame_system::{EnsureNever, EnsureRoot, limits};
use frame_system::{EnsureRoot, limits};
use sp_consensus_aura::sr25519::AuthorityId as AuraId;
use sp_consensus_grandpa::AuthorityList as GrandpaAuthorityList;
use sp_core::U256;
Expand Down Expand Up @@ -128,7 +128,6 @@ parameter_types! {
pub const InitialMinDifficulty: u64 = 1;
pub const InitialMaxDifficulty: u64 = u64::MAX;
pub const InitialRAORecycledForRegistration: u64 = 0;
pub const InitialSenateRequiredStakePercentage: u64 = 2; // 2 percent of total stake
pub const InitialNetworkImmunityPeriod: u64 = 1_296_000;
pub const InitialNetworkMinLockCost: u64 = 100_000_000_000;
pub const InitialSubnetOwnerCut: u16 = 0; // 0%. 100% of rewards go to validators + miners.
Expand Down Expand Up @@ -160,9 +159,6 @@ impl pallet_subtensor::Config for Test {
type Currency = Balances;
type InitialIssuance = InitialIssuance;
type SudoRuntimeCall = TestRuntimeCall;
type CouncilOrigin = EnsureNever<AccountId>;
type SenateMembers = ();
type TriumvirateInterface = ();
type Scheduler = Scheduler;
type InitialMinAllowedWeights = InitialMinAllowedWeights;
type InitialEmissionValue = InitialEmissionValue;
Expand Down Expand Up @@ -205,7 +201,6 @@ impl pallet_subtensor::Config for Test {
type MinBurnUpperBound = MinBurnUpperBound;
type MaxBurnLowerBound = MaxBurnLowerBound;
type InitialRAORecycledForRegistration = InitialRAORecycledForRegistration;
type InitialSenateRequiredStakePercentage = InitialSenateRequiredStakePercentage;
type InitialNetworkImmunityPeriod = InitialNetworkImmunityPeriod;
type InitialNetworkMinLockCost = InitialNetworkMinLockCost;
type InitialSubnetOwnerCut = InitialSubnetOwnerCut;
Expand Down
55 changes: 0 additions & 55 deletions pallets/collective/Cargo.toml

This file was deleted.

25 changes: 0 additions & 25 deletions pallets/collective/README.md

This file was deleted.

Loading