Skip to content

Commit

Permalink
Update from franciscoaguirre running command 'fmt'
Browse files Browse the repository at this point in the history
  • Loading branch information
@github-actions
github-actions[bot] committed Jan 27, 2025
1 parent 5432cbc commit 4e0fb26
Show file tree
Hide file tree
Showing 17 changed files with 93 additions and 91 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ members = [
"bridges/snowbridge/pallets/ethereum-client",
"bridges/snowbridge/pallets/ethereum-client/fixtures",
"bridges/snowbridge/pallets/inbound-queue",
"bridges/snowbridge/pallets/inbound-queue/fixtures",
"bridges/snowbridge/pallets/inbound-queue-v2",
"bridges/snowbridge/pallets/inbound-queue-v2/fixtures",
"bridges/snowbridge/pallets/inbound-queue-v2/runtime-api",
"bridges/snowbridge/pallets/inbound-queue/fixtures",
"bridges/snowbridge/pallets/outbound-queue",
"bridges/snowbridge/pallets/outbound-queue/merkle-tree",
"bridges/snowbridge/pallets/outbound-queue/runtime-api",
Expand Down Expand Up @@ -1228,6 +1228,7 @@ smoldot-light = { version = "0.9.0", default-features = false }
snowbridge-beacon-primitives = { path = "bridges/snowbridge/primitives/beacon", default-features = false }
snowbridge-core = { path = "bridges/snowbridge/primitives/core", default-features = false }
snowbridge-ethereum = { path = "bridges/snowbridge/primitives/ethereum", default-features = false }
snowbridge-inbound-queue-v2-runtime-api = { path = "bridges/snowbridge/pallets/inbound-queue-v2/runtime-api", default-features = false }
snowbridge-outbound-queue-merkle-tree = { path = "bridges/snowbridge/pallets/outbound-queue/merkle-tree", default-features = false }
snowbridge-outbound-queue-runtime-api = { path = "bridges/snowbridge/pallets/outbound-queue/runtime-api", default-features = false }
snowbridge-pallet-ethereum-client = { path = "bridges/snowbridge/pallets/ethereum-client", default-features = false }
Expand All @@ -1236,7 +1237,6 @@ snowbridge-pallet-inbound-queue = { path = "bridges/snowbridge/pallets/inbound-q
snowbridge-pallet-inbound-queue-fixtures = { path = "bridges/snowbridge/pallets/inbound-queue/fixtures", default-features = false }
snowbridge-pallet-inbound-queue-fixtures-v2 = { path = "bridges/snowbridge/pallets/inbound-queue-v2/fixtures", default-features = false }
snowbridge-pallet-inbound-queue-v2 = { path = "bridges/snowbridge/pallets/inbound-queue-v2", default-features = false }
snowbridge-inbound-queue-v2-runtime-api = { path = "bridges/snowbridge/pallets/inbound-queue-v2/runtime-api", default-features = false }
snowbridge-pallet-outbound-queue = { path = "bridges/snowbridge/pallets/outbound-queue", default-features = false }
snowbridge-pallet-system = { path = "bridges/snowbridge/pallets/system", default-features = false }
snowbridge-router-primitives = { path = "bridges/snowbridge/primitives/router", default-features = false }
Expand Down
94 changes: 47 additions & 47 deletions bridges/snowbridge/pallets/inbound-queue-v2/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,80 +15,80 @@ workspace = true
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
serde = { optional = true, workspace = true, default-features = true }
alloy-core = { workspace = true, features = ["sol-types"] }
codec = { features = ["derive"], workspace = true }
scale-info = { features = ["derive"], workspace = true }
hex-literal = { optional = true, workspace = true, default-features = true }
log = { workspace = true }
alloy-core = { workspace = true, features = ["sol-types"] }
scale-info = { features = ["derive"], workspace = true }
serde = { optional = true, workspace = true, default-features = true }

frame-benchmarking = { optional = true, workspace = true }
frame-support = { workspace = true }
frame-system = { workspace = true }
pallet-balances = { workspace = true }
sp-core = { workspace = true }
sp-std = { workspace = true }
sp-io = { workspace = true }
sp-runtime = { workspace = true }
sp-std = { workspace = true }

xcm = { workspace = true }
xcm-executor = { workspace = true }
xcm-builder = { workspace = true }
xcm-executor = { workspace = true }

snowbridge-core = { workspace = true }
snowbridge-router-primitives = { workspace = true }
snowbridge-beacon-primitives = { workspace = true }
snowbridge-core = { workspace = true }
snowbridge-pallet-inbound-queue-fixtures-v2 = { optional = true, workspace = true }
snowbridge-router-primitives = { workspace = true }

[dev-dependencies]
frame-benchmarking = { workspace = true, default-features = true }
sp-keyring = { workspace = true, default-features = true }
snowbridge-pallet-ethereum-client = { workspace = true, default-features = true }
hex-literal = { workspace = true, default-features = true }
hex = { workspace = true, default-features = true }
hex-literal = { workspace = true, default-features = true }
snowbridge-pallet-ethereum-client = { workspace = true, default-features = true }
sp-keyring = { workspace = true, default-features = true }

[features]
default = ["std"]
std = [
"alloy-core/std",
"codec/std",
"frame-benchmarking/std",
"frame-support/std",
"frame-system/std",
"log/std",
"pallet-balances/std",
"scale-info/std",
"serde",
"snowbridge-beacon-primitives/std",
"snowbridge-core/std",
"snowbridge-pallet-inbound-queue-fixtures-v2?/std",
"snowbridge-router-primitives/std",
"sp-core/std",
"sp-io/std",
"sp-runtime/std",
"sp-std/std",
"xcm-executor/std",
"xcm-builder/std",
"xcm/std",
"alloy-core/std",
"codec/std",
"frame-benchmarking/std",
"frame-support/std",
"frame-system/std",
"log/std",
"pallet-balances/std",
"scale-info/std",
"serde",
"snowbridge-beacon-primitives/std",
"snowbridge-core/std",
"snowbridge-pallet-inbound-queue-fixtures-v2?/std",
"snowbridge-router-primitives/std",
"sp-core/std",
"sp-io/std",
"sp-runtime/std",
"sp-std/std",
"xcm-builder/std",
"xcm-executor/std",
"xcm/std",
]
runtime-benchmarks = [
"frame-benchmarking",
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"hex-literal",
"pallet-balances/runtime-benchmarks",
"snowbridge-core/runtime-benchmarks",
"snowbridge-pallet-ethereum-client/runtime-benchmarks",
"snowbridge-pallet-inbound-queue-fixtures-v2/runtime-benchmarks",
"snowbridge-router-primitives/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"frame-benchmarking",
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"hex-literal",
"pallet-balances/runtime-benchmarks",
"snowbridge-core/runtime-benchmarks",
"snowbridge-pallet-ethereum-client/runtime-benchmarks",
"snowbridge-pallet-inbound-queue-fixtures-v2/runtime-benchmarks",
"snowbridge-router-primitives/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
]
try-runtime = [
"frame-support/try-runtime",
"frame-system/try-runtime",
"pallet-balances/try-runtime",
"snowbridge-pallet-ethereum-client/try-runtime",
"sp-runtime/try-runtime",
"frame-support/try-runtime",
"frame-system/try-runtime",
"pallet-balances/try-runtime",
"snowbridge-pallet-ethereum-client/try-runtime",
"sp-runtime/try-runtime",
]
14 changes: 7 additions & 7 deletions bridges/snowbridge/pallets/inbound-queue-v2/fixtures/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
hex-literal = { workspace = true, default-features = true }
snowbridge-beacon-primitives = { workspace = true }
snowbridge-core = { workspace = true }
sp-core = { workspace = true }
sp-std = { workspace = true }
snowbridge-core = { workspace = true }
snowbridge-beacon-primitives = { workspace = true }

[features]
default = ["std"]
std = [
"snowbridge-beacon-primitives/std",
"snowbridge-core/std",
"sp-core/std",
"sp-std/std",
"snowbridge-beacon-primitives/std",
"snowbridge-core/std",
"sp-core/std",
"sp-std/std",
]
runtime-benchmarks = [
"snowbridge-core/runtime-benchmarks",
"snowbridge-core/runtime-benchmarks",
]
4 changes: 2 additions & 2 deletions bridges/snowbridge/pallets/inbound-queue-v2/fixtures/src/register_token.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

use hex_literal::hex;
use snowbridge_beacon_primitives::{
types::deneb, AncestryProof, BeaconHeader, ExecutionProof, VersionedExecutionPayloadHeader,
types::deneb, AncestryProof, BeaconHeader, ExecutionProof, VersionedExecutionPayloadHeader,
};
use snowbridge_core::inbound::{InboundQueueFixture, Log, Message, Proof};
use sp_core::U256;
use sp_std::vec;

pub fn make_register_token_message() -> InboundQueueFixture {
InboundQueueFixture {
InboundQueueFixture {
message: Message {
event_log: Log {
address: hex!("eda338e4dc46038493b885327842fd3e301cab39").into(),
Expand Down
4 changes: 2 additions & 2 deletions bridges/snowbridge/pallets/inbound-queue-v2/fixtures/src/send_token.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

use hex_literal::hex;
use snowbridge_beacon_primitives::{
types::deneb, AncestryProof, BeaconHeader, ExecutionProof, VersionedExecutionPayloadHeader,
types::deneb, AncestryProof, BeaconHeader, ExecutionProof, VersionedExecutionPayloadHeader,
};
use snowbridge_core::inbound::{InboundQueueFixture, Log, Message, Proof};
use sp_core::U256;
use sp_std::vec;

pub fn make_send_token_message() -> InboundQueueFixture {
InboundQueueFixture {
InboundQueueFixture {
message: Message {
event_log: Log {
address: hex!("eda338e4dc46038493b885327842fd3e301cab39").into(),
Expand Down
4 changes: 2 additions & 2 deletions bridges/snowbridge/pallets/inbound-queue-v2/fixtures/src/send_token_to_penpal.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

use hex_literal::hex;
use snowbridge_beacon_primitives::{
types::deneb, AncestryProof, BeaconHeader, ExecutionProof, VersionedExecutionPayloadHeader,
types::deneb, AncestryProof, BeaconHeader, ExecutionProof, VersionedExecutionPayloadHeader,
};
use snowbridge_core::inbound::{InboundQueueFixture, Log, Message, Proof};
use sp_core::U256;
use sp_std::vec;

pub fn make_send_token_to_penpal_message() -> InboundQueueFixture {
InboundQueueFixture {
InboundQueueFixture {
message: Message {
event_log: Log {
address: hex!("eda338e4dc46038493b885327842fd3e301cab39").into(),
Expand Down
16 changes: 8 additions & 8 deletions bridges/snowbridge/pallets/inbound-queue-v2/runtime-api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
frame-support = { workspace = true, default-features = false }
sp-api = { workspace = true, default-features = false }
sp-runtime = { workspace = true, default-features = false }
snowbridge-core = { workspace = true, default-features = false }
snowbridge-router-primitives = { workspace = true, default-features = false }
sp-api = { workspace = true, default-features = false }
sp-runtime = { workspace = true, default-features = false }
xcm = { workspace = true, default-features = false }

[features]
default = ["std"]
std = [
"frame-support/std",
"snowbridge-core/std",
"snowbridge-router-primitives/std",
"sp-runtime/std",
"sp-api/std",
"xcm/std",
"frame-support/std",
"snowbridge-core/std",
"snowbridge-router-primitives/std",
"sp-api/std",
"sp-runtime/std",
"xcm/std",
]
2 changes: 1 addition & 1 deletion bridges/snowbridge/pallets/inbound-queue-v2/runtime-api/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

use frame_support::traits::tokens::Balance as BalanceT;
use snowbridge_router_primitives::inbound::v2::Message;
use xcm::latest::Xcm;
use sp_runtime::DispatchError;
use xcm::latest::Xcm;

sp_api::decl_runtime_apis! {
pub trait InboundQueueApiV2<Balance> where Balance: BalanceT
Expand Down
2 changes: 1 addition & 1 deletion bridges/snowbridge/primitives/core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ workspace = true
[dependencies]
codec = { workspace = true }
hex-literal = { workspace = true, default-features = true }
log = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
serde = { optional = true, features = ["alloc", "derive"], workspace = true }
log = { workspace = true }

polkadot-parachain-primitives = { workspace = true }
xcm = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions bridges/snowbridge/primitives/router/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ categories = ["cryptography::cryptocurrencies"]
workspace = true

[dependencies]
alloy-core = { workspace = true, features = ["sol-types"] }
codec = { workspace = true }
log = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
alloy-core = { workspace = true, features = ["sol-types"] }

frame-support = { workspace = true }
frame-system = { workspace = true }
Expand All @@ -25,13 +25,13 @@ sp-runtime = { workspace = true }
sp-std = { workspace = true }

xcm = { workspace = true }
xcm-executor = { workspace = true }
xcm-builder = { workspace = true }
xcm-executor = { workspace = true }

snowbridge-core = { workspace = true }

hex-literal = { workspace = true, default-features = true }
hex = { workspace = true, default-features = false }
hex-literal = { workspace = true, default-features = true }

[dev-dependencies]

Expand Down
6 changes: 4 additions & 2 deletions bridges/snowbridge/primitives/router/src/inbound/v2.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use codec::{Decode, DecodeLimit, Encode};
use core::marker::PhantomData;
use frame_support::PalletError;
use hex;
use scale_info::TypeInfo;
use snowbridge_core::TokenId;
use sp_core::{Get, RuntimeDebug, H160, H256};
Expand All @@ -14,7 +15,6 @@ use xcm::{
prelude::{Asset as XcmAsset, Junction::AccountKey20, *},
MAX_XCM_DECODE_DEPTH,
};
use hex;

const LOG_TARGET: &str = "snowbridge-router-primitives";

Expand Down Expand Up @@ -172,7 +172,9 @@ where
if let Ok(claimer) = Junction::decode(&mut claimer.as_ref()) {
let claimer_location: Location = Location::new(0, [claimer.into()]);
refund_surplus_to = claimer_location.clone();
instructions.push(SetHints { hints: vec![AssetClaimer {location: claimer_location }].try_into().unwrap() }); // TODO
instructions.push(SetHints {
hints: vec![AssetClaimer { location: claimer_location }].try_into().unwrap(),
}); // TODO
}
}

Expand Down
6 changes: 2 additions & 4 deletions ...chains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/snowbridge.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@ use snowbridge_pallet_inbound_queue_fixtures::{
};
use snowbridge_pallet_system;
use snowbridge_router_primitives::inbound::{
EthereumLocationsConverterFor
};
use snowbridge_router_primitives::inbound::v1::{
Command, Destination, MessageV1, VersionedMessage,
v1::{Command, Destination, MessageV1, VersionedMessage},
EthereumLocationsConverterFor,
};
use sp_core::H256;
use sp_runtime::{DispatchError::Token, TokenError::FundsUnavailable};
Expand Down
4 changes: 2 additions & 2 deletions cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ workspace = true

[dependencies]
codec = { workspace = true }
hex-literal = { workspace = true, default-features = true }
hex = { workspace = true, default-features = true }
hex-literal = { workspace = true, default-features = true }
log = { workspace = true }
scale-info = { workspace = true }

Expand Down Expand Up @@ -42,9 +42,9 @@ bridge-hub-westend-runtime = { workspace = true }
cumulus-pallet-xcmp-queue = { workspace = true }
emulated-integration-tests-common = { workspace = true }
parachains-common = { workspace = true, default-features = true }
penpal-emulated-chain = { workspace = true }
rococo-westend-system-emulated-network = { workspace = true }
testnet-parachains-constants = { features = ["rococo", "westend"], workspace = true, default-features = true }
penpal-emulated-chain = { workspace = true }

# Snowbridge
snowbridge-core = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ pub mod bridging {
use assets_common::matching::FromNetwork;
use sp_std::collections::btree_set::BTreeSet;
use testnet_parachains_constants::westend::snowbridge::{
EthereumNetwork, INBOUND_QUEUE_PALLET_INDEX_V1, INBOUND_QUEUE_PALLET_INDEX_V2
EthereumNetwork, INBOUND_QUEUE_PALLET_INDEX_V1, INBOUND_QUEUE_PALLET_INDEX_V2,
};

parameter_types! {
Expand Down
Loading

0 comments on commit 4e0fb26

Please sign in to comment.