Skip to content

Commit

Permalink
parachain bin
Browse files Browse the repository at this point in the history
  • Loading branch information
joepetrowski committed Aug 27, 2023
1 parent dc26bfe commit 63ded5b
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 19 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::*;
use asset_hub_kusama_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
use frame_support::{instances::Instance2, BoundedVec};
use parachains_common::kusama::currency::EXISTENTIAL_DEPOSIT;
use sp_runtime::{DispatchError, ModuleError};

#[test]
Expand Down Expand Up @@ -167,11 +167,9 @@ fn swap_locally_on_chain_using_foreign_assets() {
.encode()
.into();

let buy_execution_fee_amount =
asset_hub_kusama_runtime::constants::fee::WeightToFee::weight_to_fee(&Weight::from_parts(
10_100_000_000_000,
300_000,
));
let buy_execution_fee_amount = parachains_common::kusama::fee::WeightToFee::weight_to_fee(
&Weight::from_parts(10_100_000_000_000, 300_000),
);
let buy_execution_fee = MultiAsset {
id: Concrete(MultiLocation { parents: 1, interior: Here }),
fun: Fungible(buy_execution_fee_amount),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,9 @@ fn swap_locally_on_chain_using_foreign_assets() {
.encode()
.into();

let buy_execution_fee_amount =
asset_hub_westend_runtime::constants::fee::WeightToFee::weight_to_fee(&Weight::from_parts(
10_100_000_000_000,
300_000,
));
let buy_execution_fee_amount = parachains_common::westend::fee::WeightToFee::weight_to_fee(
&Weight::from_parts(10_100_000_000_000, 300_000),
);
let buy_execution_fee = MultiAsset {
id: Concrete(MultiLocation { parents: 1, interior: Here }),
fun: Fungible(buy_execution_fee_amount),
Expand Down
6 changes: 3 additions & 3 deletions cumulus/polkadot-parachain/src/chain_spec/asset_hubs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ pub type AssetHubWestendChainSpec =
sc_service::GenericChainSpec<asset_hub_westend_runtime::RuntimeGenesisConfig, Extensions>;

const ASSET_HUB_POLKADOT_ED: AssetHubBalance =
asset_hub_polkadot_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
parachains_common::polkadot::currency::EXISTENTIAL_DEPOSIT;
const ASSET_HUB_KUSAMA_ED: AssetHubBalance =
asset_hub_kusama_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
parachains_common::kusama::currency::EXISTENTIAL_DEPOSIT;
const ASSET_HUB_WESTEND_ED: AssetHubBalance =
asset_hub_westend_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
parachains_common::westend::currency::EXISTENTIAL_DEPOSIT;

/// Generate the session keys from individual elements.
///
Expand Down
6 changes: 3 additions & 3 deletions cumulus/polkadot-parachain/src/chain_spec/bridge_hubs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ pub mod rococo {
pub(crate) const BRIDGE_HUB_ROCOCO_LOCAL: &str = "bridge-hub-rococo-local";
pub(crate) const BRIDGE_HUB_ROCOCO_DEVELOPMENT: &str = "bridge-hub-rococo-dev";
const BRIDGE_HUB_ROCOCO_ED: BridgeHubBalance =
bridge_hub_rococo_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
parachains_common::rococo::currency::EXISTENTIAL_DEPOSIT;

/// Specialized `ChainSpec` for the normal parachain runtime.
pub type BridgeHubChainSpec =
Expand Down Expand Up @@ -372,7 +372,7 @@ pub mod kusama {
pub(crate) const BRIDGE_HUB_KUSAMA_LOCAL: &str = "bridge-hub-kusama-local";
pub(crate) const BRIDGE_HUB_KUSAMA_DEVELOPMENT: &str = "bridge-hub-kusama-dev";
const BRIDGE_HUB_KUSAMA_ED: BridgeHubBalance =
bridge_hub_kusama_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
parachains_common::kusama::currency::EXISTENTIAL_DEPOSIT;

/// Specialized `ChainSpec` for the normal parachain runtime.
pub type BridgeHubChainSpec =
Expand Down Expand Up @@ -509,7 +509,7 @@ pub mod polkadot {
pub(crate) const BRIDGE_HUB_POLKADOT_LOCAL: &str = "bridge-hub-polkadot-local";
pub(crate) const BRIDGE_HUB_POLKADOT_DEVELOPMENT: &str = "bridge-hub-polkadot-dev";
const BRIDGE_HUB_POLKADOT_ED: BridgeHubBalance =
bridge_hub_polkadot_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
parachains_common::polkadot::currency::EXISTENTIAL_DEPOSIT;

/// Specialized `ChainSpec` for the normal parachain runtime.
pub type BridgeHubChainSpec =
Expand Down
2 changes: 1 addition & 1 deletion cumulus/polkadot-parachain/src/chain_spec/collectives.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pub type CollectivesPolkadotChainSpec =
sc_service::GenericChainSpec<collectives_polkadot_runtime::RuntimeGenesisConfig, Extensions>;

const COLLECTIVES_POLKADOT_ED: CollectivesBalance =
collectives_polkadot_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
parachains_common::polkadot::currency::EXISTENTIAL_DEPOSIT;

/// Generate the session keys from individual elements.
///
Expand Down
2 changes: 1 addition & 1 deletion cumulus/polkadot-parachain/src/chain_spec/contracts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const CONTRACTS_PARACHAIN_ID: u32 = 1002;

/// The existential deposit is determined by the runtime "contracts-rococo".
const CONTRACTS_ROCOCO_ED: contracts_rococo_runtime::Balance =
contracts_rococo_runtime::constants::currency::EXISTENTIAL_DEPOSIT;
parachains_common::rococo::currency::EXISTENTIAL_DEPOSIT;

pub fn contracts_rococo_development_config() -> ContractsRococoChainSpec {
let mut properties = sc_chain_spec::Properties::new();
Expand Down

0 comments on commit 63ded5b

Please sign in to comment.