minor refactoring and linting

ltfschoen · ltfschoen · commit 28f6fc630ce2 · 2022-03-17T07:46:33.000+01:00
diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs
@@ -2,16 +2,15 @@ use crate::fixtures::get_allocation;
 use cumulus_primitives_core::ParaId;
 use datahighway_parachain_runtime::{
     AuraId,
-    // AuthorityDiscoveryConfig,
     AuraConfig,
     BalancesConfig,
     CollatorSelectionConfig,
     GenesisConfig,
     IndicesConfig,
     SessionConfig,
-    // SessionKeys,
+    SessionKeys,
     SudoConfig,
-    // SystemConfig,
+    SystemConfig,
     TransactionPaymentConfig,
     TreasuryConfig,
 };
@@ -20,7 +19,7 @@ use module_primitives::{
         DOLLARS,
         EXISTENTIAL_DEPOSIT,
     },
-	types::{
+    types::{
         AccountId,
         Balance,
         Signature,
@@ -78,7 +77,7 @@ const KUSAMA_LOCAL_PROTOCOL_ID: &str = "dhx-kusama-local";
 const KUSAMA_TANGANIKA_PROTOCOL_ID: &str = "dhx-kusama-tanganika";
 
 /// Specialized `ChainSpec` for the normal parachain runtime.
-pub type ChainSpec = sc_service::GenericChainSpec<datahighway_parachain_runtime::GenesisConfig, Extensions>;
+pub type ChainSpec = sc_service::GenericChainSpec<GenesisConfig, Extensions>;
 
 // Note this is the URL for the telemetry server
 const POLKADOT_STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
@@ -129,8 +128,8 @@ where
 /// Generate the session keys from individual elements.
 ///
 /// The input must be a tuple of individual keys (a single arg for now since we have just one key).
-pub fn datahighway_session_keys(keys: AuraId) -> datahighway_parachain_runtime::SessionKeys {
-    datahighway_parachain_runtime::SessionKeys { aura: keys }
+pub fn datahighway_session_keys(keys: AuraId) -> SessionKeys {
+    SessionKeys { aura: keys }
 }
 
 // DHX DAO Unlocked Reserves Balance
@@ -1182,7 +1181,7 @@ fn spreehafen_testnet_genesis(
     let hardspoon_balances = get_balances(endowed_accounts.clone());
 
     GenesisConfig {
-        system: datahighway_parachain_runtime::SystemConfig {
+        system: SystemConfig {
             code: datahighway_parachain_runtime::WASM_BINARY.expect("WASM binary was not build, please build it!").to_vec(),
         },
         balances: BalancesConfig {
@@ -1219,8 +1218,7 @@ fn spreehafen_testnet_genesis(
                 })
                 .collect(),
         },
-        // no need to pass anything to aura, in fact it will panic if we do. Session will take care
-        // of this.
+        // it will panic if we pass anything to Aura. Session will take care of this instead.
         aura: Default::default(),
         transaction_payment: TransactionPaymentConfig::default(),
         aura_ext: Default::default(),
@@ -1242,7 +1240,7 @@ fn testnet_genesis(
     let hardspoon_balances = get_balances(endowed_accounts.clone());
 
     GenesisConfig {
-        system: datahighway_parachain_runtime::SystemConfig {
+        system: SystemConfig {
             code: datahighway_parachain_runtime::WASM_BINARY.expect("WASM binary was not build, please build it!").to_vec(),
         },
         balances: BalancesConfig {
@@ -1279,8 +1277,7 @@ fn testnet_genesis(
                 })
                 .collect(),
         },
-        // no need to pass anything to aura, in fact it will panic if we do. Session will take care
-        // of this.
+        // it will panic if we pass anything to Aura. Session will take care of this instead.
         aura: Default::default(),
         transaction_payment: TransactionPaymentConfig::default(),
         aura_ext: Default::default(),
@@ -1297,12 +1294,12 @@ fn dev_genesis(
     endowed_accounts: Vec<AccountId>,
     id: ParaId,
     _enable_println: bool,
-) -> datahighway_parachain_runtime::GenesisConfig {
+) -> GenesisConfig {
     let num_endowed_accounts = endowed_accounts.len();
     let hardspoon_balances = get_balances(endowed_accounts.clone());
 
-    datahighway_parachain_runtime::GenesisConfig {
-        system: datahighway_parachain_runtime::SystemConfig {
+    GenesisConfig {
+        system: SystemConfig {
             code: datahighway_parachain_runtime::WASM_BINARY.expect("WASM binary was not build, please build it!").to_vec(),
         },
         balances: BalancesConfig {
@@ -1339,8 +1336,7 @@ fn dev_genesis(
                 })
                 .collect(),
         },
-        // no need to pass anything to aura, in fact it will panic if we do. Session will take care
-        // of this.
+        // it will panic if we pass anything to Aura. Session will take care of this instead.
         aura: Default::default(),
         transaction_payment: TransactionPaymentConfig::default(),
         aura_ext: Default::default(),
@@ -1361,7 +1357,7 @@ fn baikal_testnet_genesis(
     let num_endowed_accounts = endowed_accounts.len();
 
     GenesisConfig {
-        system: datahighway_parachain_runtime::SystemConfig {
+        system: SystemConfig {
             code: datahighway_parachain_runtime::WASM_BINARY.expect("WASM binary was not build, please build it!").to_vec(),
         },
         balances: BalancesConfig {
@@ -1410,8 +1406,7 @@ fn baikal_testnet_genesis(
                 })
                 .collect(),
         },
-        // no need to pass anything to aura, in fact it will panic if we do. Session will take care
-        // of this.
+        // it will panic if we pass anything to Aura. Session will take care of this instead.
         aura: Default::default(),
         transaction_payment: TransactionPaymentConfig::default(),
         aura_ext: Default::default(),
@@ -1433,7 +1428,7 @@ fn tanganika_testnet_genesis(
     let hardspoon_balances = get_balances(endowed_accounts.clone());
 
     GenesisConfig {
-        system: datahighway_parachain_runtime::SystemConfig {
+        system: SystemConfig {
             code: datahighway_parachain_runtime::WASM_BINARY.expect("WASM binary was not build, please build it!").to_vec(),
         },
         balances: BalancesConfig {
@@ -1470,8 +1465,7 @@ fn tanganika_testnet_genesis(
                 })
                 .collect(),
         },
-        // no need to pass anything to aura, in fact it will panic if we do. Session will take care
-        // of this.
+        // it will panic if we pass anything to Aura. Session will take care of this instead.
         aura: Default::default(),
         transaction_payment: TransactionPaymentConfig::default(),
         aura_ext: Default::default(),
diff --git a/node/src/rpc.rs b/node/src/rpc.rs
@@ -9,7 +9,7 @@ use std::sync::Arc;
 
 use datahighway_parachain_runtime::{opaque::Block};
 use module_primitives::{
-	types::{
+    types::{
         AccountId,
         Balance,
         Index as Nonce,
diff --git a/node/src/service.rs b/node/src/service.rs
@@ -8,7 +8,7 @@ use datahighway_parachain_runtime::{
     opaque::{Block, Header}, RuntimeApi,
 };
 use module_primitives::{
-	types::{
+    types::{
         AccountId,
         Balance,
         Hash,
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -42,7 +42,7 @@ pub use frame_support::{
         DispatchClass, IdentityFee, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients,
         WeightToFeePolynomial,
     },
-	PalletId,
+    PalletId,
     RuntimeDebug,
     StorageValue,
 };
diff --git a/scripts/benchmark_all_pallets.sh b/scripts/benchmark_all_pallets.sh
@@ -8,79 +8,79 @@ COLLATOR=./target/release/datahighway-collator
 mkdir -p $DATAHIGHWAY_RUNTIME_WEIGHT_DIR
 
 pallets=(
-  "frame_system" \
-  "cumulus_pallet_parachain_system" \
-  "pallet_utility" \
-  "pallet_timestamp" \
-  "pallet_identity" \
-  "pallet_scheduler" \
-  "parachain_info" \
-  "pallet_indices" \
-  "pallet_balances" \
-  "pallet_transaction_payment" \
-  "pallet_collator_selection" \
-  "pallet_democracy" \
-  "pallet_xcm" \
-  "pallet_collective" \
-  "pallet_elections_phragmen" \
-  "pallet_membership" \
-  "pallet_treasury" \
-  "pallet_bounties" \
-  "pallet_child_bounties" \
-  "pallet_tips" \
-  "pallet_preimage" \
-  "pallet_proxy" \
-  "pallet_multisig" \
-  "pallet_referenda" \
-  "pallet_conviction_voting" \
-  "membership_supernodes" \
-  "roaming_operators" \
-  "roaming_networks" \
-  "roaming_organizations" \
-  "roaming_network_servers" \
-  "roaming_devices" \
-  "roaming_routing_profiles" \
-  "roaming_service_profiles" \
-  "roaming_accounting_policies" \
-  "roaming_agreement_policies" \
-  "roaming_network_profiles" \
-  "roaming_device_profiles" \
-  "roaming_sessions" \
-  "roaming_billing_policies" \
-  "roaming_charging_policies" \
-  "roaming_packet_bundles" \
-  "mining_setting_token" \
-  "mining_setting_hardware" \
-  "mining_rates_token" \
-  "mining_rates_hardware" \
-  "mining_sampling_token" \
-  "mining_sampling_hardware" \
-  "mining_eligibility_token" \
-  "mining_eligibility_hardware" \
-  "mining_eligibility_proxy" \
-  "mining_lodgements_hardware" \
-  "mining_claims_token" \
-  "mining_claims_hardware" \
-  "mining_execution_token" \
-  "exchange_rate" \
-  "treasury_dao" \
+    "frame_system" \
+    "cumulus_pallet_parachain_system" \
+    "pallet_utility" \
+    "pallet_timestamp" \
+    "pallet_identity" \
+    "pallet_scheduler" \
+    "parachain_info" \
+    "pallet_indices" \
+    "pallet_balances" \
+    "pallet_transaction_payment" \
+    "pallet_collator_selection" \
+    "pallet_democracy" \
+    "pallet_xcm" \
+    "pallet_collective" \
+    "pallet_elections_phragmen" \
+    "pallet_membership" \
+    "pallet_treasury" \
+    "pallet_bounties" \
+    "pallet_child_bounties" \
+    "pallet_tips" \
+    "pallet_preimage" \
+    "pallet_proxy" \
+    "pallet_multisig" \
+    "pallet_referenda" \
+    "pallet_conviction_voting" \
+    "membership_supernodes" \
+    "roaming_operators" \
+    "roaming_networks" \
+    "roaming_organizations" \
+    "roaming_network_servers" \
+    "roaming_devices" \
+    "roaming_routing_profiles" \
+    "roaming_service_profiles" \
+    "roaming_accounting_policies" \
+    "roaming_agreement_policies" \
+    "roaming_network_profiles" \
+    "roaming_device_profiles" \
+    "roaming_sessions" \
+    "roaming_billing_policies" \
+    "roaming_charging_policies" \
+    "roaming_packet_bundles" \
+    "mining_setting_token" \
+    "mining_setting_hardware" \
+    "mining_rates_token" \
+    "mining_rates_hardware" \
+    "mining_sampling_token" \
+    "mining_sampling_hardware" \
+    "mining_eligibility_token" \
+    "mining_eligibility_hardware" \
+    "mining_eligibility_proxy" \
+    "mining_lodgements_hardware" \
+    "mining_claims_token" \
+    "mining_claims_hardware" \
+    "mining_execution_token" \
+    "exchange_rate" \
+    "treasury_dao" \
 )
 
 for pallet in ${pallets[*]}; do
-  echo benchmarking "$pallet"...
+    echo benchmarking "$pallet"...
 
-  cargo build --release \
-  --features runtime-benchmarks \
+    cargo build --release \
+    --features runtime-benchmarks \
 
-  $COLLATOR \
-  benchmark \
-  --chain=rococo-local \
-  --steps=50 \
-  --repeat=20 \
-  --pallet="$pallet" \
-  --extrinsic="*" \
-  --execution=wasm \
-  --wasm-execution=compiled \
-  --heap-pages=4096 \
-  --output=./$DATAHIGHWAY_RUNTIME_WEIGHT_DIR/"$pallet".rs \
+    $COLLATOR \
+    benchmark \
+    --chain=rococo-local \
+    --steps=50 \
+    --repeat=20 \
+    --pallet="$pallet" \
+    --extrinsic="*" \
+    --execution=wasm \
+    --wasm-execution=compiled \
+    --heap-pages=4096 \
+    --output=./$DATAHIGHWAY_RUNTIME_WEIGHT_DIR/"$pallet".rs \
 done
diff --git a/scripts/dump_wasm_and_state_for_all_chains.sh b/scripts/dump_wasm_and_state_for_all_chains.sh
@@ -19,14 +19,14 @@ mkdir -p ${DUMP_DIR}
 
 # Note: chachacha and polkadot have been omitted
 chainspecs=(
-      "rococo-dev" \
-      "rococo-local" \
-      "rococo" \
-      "kusama" \
-      "kusama-dev" \
-      "kusama-local" \
-      "kusama" \
-      )
+    "rococo-dev" \
+    "rococo-local" \
+    "rococo" \
+    "kusama" \
+    "kusama-dev" \
+    "kusama-local" \
+    "kusama" \
+)
 
 $COLLATOR --version
 # Print array values in  lines
diff --git a/traits/account-set/Cargo.toml b/traits/account-set/Cargo.toml
@@ -9,9 +9,9 @@ license = 'GPL-3.0-or-later'
 
 [package.metadata.substrate]
 categories = [
-	'trait',
-	'accounts',
-	'recipe',
+    'trait',
+    'accounts',
+    'recipe',
 ]
 compatibility_version = '2.0.0'
 
@@ -22,7 +22,7 @@ std = [
     'frame-support/std',
     'frame-system/std',
     'frame-benchmarking/std',
-	'sp-std/std',
+    'sp-std/std',
 ]
 try-runtime = ['frame-support/try-runtime']
 
