Skip to content

Commit

Permalink
fix benchmark build
Browse files Browse the repository at this point in the history
  • Loading branch information
brenzi committed Feb 13, 2024
1 parent bca19aa commit 50debf0
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,9 @@ pallet-xcm-transactor = { path = '../pallets/xcm-transactor' }
sgx-verify = { path = '../pallets/teerex/sgx-verify' }
teeracle-primitives = { path = '../pallets/primitives/teeracle' }
teerex-primitives = { path = '../pallets/primitives/teerex' }
test-utils = { path = '../pallets/test-utils' }
xcm-primitives = { path = '../pallets/primitives/xcm' }
xcm-transactor-primitives = { path = '../pallets/primitives/xcm-transactor' }
test-utils = { path = '../pallets/test-utils' }

[patch.crates-io]
ring = { git = "https://github.com/betrusted-io/ring-xous", branch = "0.16.20-cleanup" }
2 changes: 1 addition & 1 deletion polkadot-parachains/integritee-runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ orml-traits = { workspace = true }
orml-xcm = { workspace = true }
orml-xcm-support = { workspace = true }
orml-xtokens = { workspace = true }
pallet-assets = { workspace = true }
pallet-asset-registry = { workspace = true }
pallet-assets = { workspace = true }
pallet-aura = { workspace = true }
pallet-balances = { workspace = true }
pallet-bounties = { workspace = true }
Expand Down
11 changes: 5 additions & 6 deletions polkadot-parachains/integritee-runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));

use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
use frame_support::traits::{
fungible::HoldConsideration, tokens::PayFromAccount, AsEnsureOriginWithArg, ConstBool,
EnsureOriginWithArg, EqualPrivilegeOnly, Imbalance, InstanceFilter, LinearStoragePrice,
OnUnbalanced,
fungible::HoldConsideration, tokens::PayFromAccount, ConstBool, EnsureOriginWithArg,
EqualPrivilegeOnly, Imbalance, InstanceFilter, LinearStoragePrice, OnUnbalanced,
};
use pallet_collective;
use parachains_common::AssetIdForTrustBackedAssets;
Expand Down Expand Up @@ -69,7 +68,7 @@ use frame_support::{
};
use frame_system::{
limits::{BlockLength, BlockWeights},
EnsureRoot, EnsureRootWithSuccess, EnsureSigned, EnsureWithSuccess,
EnsureRoot, EnsureWithSuccess,
};
use integritee_parachains_common::{
fee::{SlowAdjustingFeeUpdate, WeightToFee},
Expand Down Expand Up @@ -811,8 +810,8 @@ impl EnsureOriginWithArg<RuntimeOrigin, AssetIdForTrustBackedAssets> for NoAsset
}

#[cfg(feature = "runtime-benchmarks")]
fn successful_origin(a: &MultiLocation) -> RuntimeOrigin {
pallet_xcm::Origin::Xcm(a.clone()).into()
fn try_successful_origin(_a: &AssetIdForTrustBackedAssets) -> Result<RuntimeOrigin, ()> {
Err(())
}
}

Expand Down
8 changes: 4 additions & 4 deletions polkadot-parachains/integritee-runtime/src/xcm_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,20 @@ use frame_support::{
match_types,
pallet_prelude::{Get, PalletInfoAccess, Weight},
parameter_types,
traits::{tokens::AssetId, Contains, ContainsPair, Everything, Nothing, TransformOrigin},
traits::{Contains, ContainsPair, Everything, Nothing, TransformOrigin},
weights::IdentityFee,
};
use frame_system::EnsureRoot;
use orml_traits::{
location::{RelativeReserveProvider, Reserve},
parameter_type_with_key,
};
use orml_xcm_support::{IsNativeConcrete, MultiNativeAsset};
use orml_xcm_support::IsNativeConcrete;
use pallet_xcm::XcmPassthrough;
use parachains_common::{message_queue::ParaIdToSibling, AssetIdForTrustBackedAssets};
use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
use polkadot_parachain_primitives::primitives::Sibling;
use polkadot_runtime_common::{xcm_sender::NoPriceForMessageDelivery, ToAuthor};
use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
use scale_info::TypeInfo;
use sp_core::ConstU32;
use sp_runtime::{traits::Convert, RuntimeDebug};
Expand All @@ -65,7 +65,7 @@ use staging_xcm_builder::{
WithComputedOrigin,
};
use staging_xcm_executor::{traits::JustTry, XcmExecutor};
use xcm_primitives::{AsAssetMultiLocation, ConvertedRegisteredAssetId, IntegriteeDropAssets};
use xcm_primitives::{AsAssetMultiLocation, ConvertedRegisteredAssetId};
use xcm_transactor_primitives::*;

const fn teer_general_key() -> Junction {
Expand Down

0 comments on commit 50debf0

Please sign in to comment.