From 4d7eae59414f4e4a06fd138160703319d7441cf3 Mon Sep 17 00:00:00 2001 From: lemunozm Date: Wed, 22 Nov 2023 17:18:08 +0100 Subject: [PATCH] fix integration testing --- runtime/development/Cargo.toml | 3 + runtime/integration-tests/Cargo.toml | 107 +----------------- .../integration-tests/src/utils/extrinsics.rs | 2 - 3 files changed, 4 insertions(+), 108 deletions(-) diff --git a/runtime/development/Cargo.toml b/runtime/development/Cargo.toml index fe092fbd22..2c5217ead9 100644 --- a/runtime/development/Cargo.toml +++ b/runtime/development/Cargo.toml @@ -447,5 +447,8 @@ on-chain-release-build = [ "runtime-common/on-chain-release-build", ] +# Used by integration testing +instant-voting = [] + # Set timing constants (e.g. session period) to faster versions to speed up testing. fast-runtime = [] diff --git a/runtime/integration-tests/Cargo.toml b/runtime/integration-tests/Cargo.toml index c87e45683f..1b468c5102 100644 --- a/runtime/integration-tests/Cargo.toml +++ b/runtime/integration-tests/Cargo.toml @@ -151,114 +151,9 @@ pallet-xcm = { workspace = true, features = ["std"] } pallet-xcm-transactor = { workspace = true, features = ["std"] } parachain-info = { workspace = true, features = ["std"] } -# # Substrate -# ## Substrate-Frame -# frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.43" } -# frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" } -# pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" } -# pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# pallet-beefy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# pallet-message-queue = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" } -# pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" } -# -# ## Substrate-Primitives -# sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# #sp-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# fp-self-contained = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43" } -# sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# sp-consensus-beefy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# sp-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" } -# sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# -# ## Substrate-Client -# node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# #sc-consensus-uncles = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# sc-service = { git = "https://github.com/paritytech/substrate", features = ["rocksdb", "test-helpers"], branch = "polkadot-v0.9.43" } -# -# # Polkadot -# kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } -# pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } -# polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } -# polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } -# polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } -# polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } -# polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } -# polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } -# rococo-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } -# xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } -# -# # Cumulus -# cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -# cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -# cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -# cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -# -# parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -# -# # Orml pallets -# orml-asset-registry = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.43" } -# orml-oracle = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.43" } -# orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.43" } -# orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.43" } -# orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.43" } -# -# ethabi = { version = "16.0", default-features = false } -# ethereum = { version = "0.14.0", default-features = false } -# -# pallet-ethereum = { git = "https://github.com/moonbeam-foundation/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.43" } -# pallet-evm = { git = "https://github.com/moonbeam-foundation/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.43" } -# pallet-evm-chain-id = { git = "https://github.com/moonbeam-foundation/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.43" } -# -# axelar-gateway-precompile = { path = "../../pallets/liquidity-pools-gateway/axelar-gateway-precompile" } -# liquidity-pools-gateway-routers = { path = "../../pallets/liquidity-pools-gateway/routers" } -# pallet-block-rewards = { path = "../../pallets/block-rewards" } -# pallet-ethereum-transaction = { path = "../../pallets/ethereum-transaction" } -# pallet-foreign-investments = { path = "../../pallets/foreign-investments" } -# pallet-investments = { path = "../../pallets/investments" } -# pallet-liquidity-pools = { path = "../../pallets/liquidity-pools" } -# pallet-liquidity-pools-gateway = { path = "../../pallets/liquidity-pools-gateway" } -# pallet-loans = { path = "../../pallets/loans" } -# pallet-order-book = { path = "../../pallets/order-book" } -# pallet-permissions = { path = "../../pallets/permissions" } -# pallet-pool-registry = { path = "../../pallets/pool-registry" } -# pallet-pool-system = { path = "../../pallets/pool-system" } -# pallet-restricted-tokens = { path = "../../pallets/restricted-tokens" } -# pallet-rewards = { path = "../../pallets/rewards" } -# -# pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# pallet-xcm-transactor = { git = "https://github.com/moonbeam-foundation/moonbeam", default-features = false, rev = "96ac7576f93bb6828415bf3edeef9e8c4b5b4adf" } -# sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -# sp-std = { git = "https://github.com/paritytech/substrate", default-features = true, branch = "polkadot-v0.9.43" } -# xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = true, branch = "release-v0.9.43" } -# -# pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } - [features] default = [ - "runtime-development", + "development-runtime/instant-voting" ] -runtime-development = [] fast-runtime = ["development-runtime/fast-runtime"] diff --git a/runtime/integration-tests/src/utils/extrinsics.rs b/runtime/integration-tests/src/utils/extrinsics.rs index 84ec5819c8..54d2c792c6 100644 --- a/runtime/integration-tests/src/utils/extrinsics.rs +++ b/runtime/integration-tests/src/utils/extrinsics.rs @@ -151,8 +151,6 @@ fn signed_extra_relay(nonce: RelayIndex) -> RelaySignedExtra { frame_system::CheckNonce::::from(nonce), frame_system::CheckWeight::::new(), pallet_transaction_payment::ChargeTransactionPayment::::from(0), - #[cfg(not(feature = "runtime-development"))] - polkadot_runtime_common::claims::PrevalidateAttests::::new(), ) }