Skip to content

Commit

Permalink
more renames
Browse files Browse the repository at this point in the history
  • Loading branch information
claravanstaden authored and claravanstaden committed Jan 10, 2024
1 parent cccae19 commit 1ba3093
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
12 changes: 6 additions & 6 deletions cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ pub mod benchmark_helpers {
use sp_core::H256;
use xcm::latest::{MultiAssets, MultiLocation, SendError, SendResult, SendXcm, Xcm, XcmHash};

impl<T: snowbridge_ethereum_beacon_client::Config> BenchmarkHelper<T> for Runtime {
impl<T: snowbridge_ethereum_client_pallet::Config> BenchmarkHelper<T> for Runtime {
fn initialize_storage(block_hash: H256, header: CompactExecutionHeader) {
EthereumBeaconClient::store_execution_header(block_hash, header, 0, H256::default())
}
Expand Down Expand Up @@ -550,7 +550,7 @@ pub mod benchmark_helpers {

impl snowbridge_inbound_queue::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type Verifier = snowbridge_ethereum_beacon_client::Pallet<Runtime>;
type Verifier = snowbridge_ethereum_client_pallet::Pallet<Runtime>;
type Token = Balances;
#[cfg(not(feature = "runtime-benchmarks"))]
type XcmSender = XcmRouter;
Expand Down Expand Up @@ -638,11 +638,11 @@ parameter_types! {
pub const MaxExecutionHeadersToKeep: u32 = prod_or_fast!(8192 * 2, 1000);
}

impl snowbridge_ethereum_beacon_client::Config for Runtime {
impl snowbridge_ethereum_client_pallet::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type ForkVersions = ChainForkVersions;
type MaxExecutionHeadersToKeep = MaxExecutionHeadersToKeep;
type WeightInfo = weights::snowbridge_ethereum_beacon_client::WeightInfo<Runtime>;
type WeightInfo = weights::snowbridge_ethereum_client_pallet::WeightInfo<Runtime>;
}

impl snowbridge_system::Config for Runtime {
Expand Down Expand Up @@ -720,7 +720,7 @@ construct_runtime!(

EthereumInboundQueue: snowbridge_inbound_queue::{Pallet, Call, Storage, Event<T>} = 80,
EthereumOutboundQueue: snowbridge_outbound_queue::{Pallet, Call, Storage, Event<T>} = 81,
EthereumBeaconClient: snowbridge_ethereum_beacon_client::{Pallet, Call, Storage, Event<T>} = 82,
EthereumBeaconClient: snowbridge_ethereum_client_pallet::{Pallet, Call, Storage, Event<T>} = 82,
EthereumSystem: snowbridge_system::{Pallet, Call, Storage, Config<T>, Event<T>} = 83,

// Message Queue. Importantly, is registered last so that messages are processed after
Expand Down Expand Up @@ -776,7 +776,7 @@ mod benches {
[snowbridge_inbound_queue, EthereumInboundQueue]
[snowbridge_outbound_queue, EthereumOutboundQueue]
[snowbridge_system, EthereumSystem]
[snowbridge_ethereum_beacon_client, EthereumBeaconClient]
[snowbridge_ethereum_client_pallet, EthereumBeaconClient]
);
}

Expand Down
2 changes: 1 addition & 1 deletion cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pub mod pallet_utility;
pub mod pallet_xcm;
pub mod paritydb_weights;
pub mod rocksdb_weights;
pub mod snowbridge_ethereum_beacon_client;
pub mod snowbridge_ethereum_client_pallet;
pub mod snowbridge_inbound_queue;
pub mod snowbridge_outbound_queue;
pub mod snowbridge_system;
Expand Down
6 changes: 3 additions & 3 deletions ...ghts/snowbridge_ethereum_beacon_client.rs → ...ghts/snowbridge_ethereum_client_pallet.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//! Autogenerated weights for `snowbridge_ethereum_beacon_client`
//! Autogenerated weights for `snowbridge_ethereum_client_pallet`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2023-06-08, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
Expand Down Expand Up @@ -47,9 +47,9 @@
use frame_support::{traits::Get, weights::Weight};
use core::marker::PhantomData;

/// Weight functions for `snowbridge_ethereum_beacon_client`.
/// Weight functions for `snowbridge_ethereum_client_pallet`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> snowbridge_ethereum_beacon_client::WeightInfo for WeightInfo<T> {
impl<T: frame_system::Config> snowbridge_ethereum_client_pallet::WeightInfo for WeightInfo<T> {
/// Storage: EthereumBeaconClient FinalizedBeaconStateIndex (r:1 w:1)
/// Proof: EthereumBeaconClient FinalizedBeaconStateIndex (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
/// Storage: EthereumBeaconClient FinalizedBeaconStateMapping (r:1 w:1)
Expand Down
4 changes: 2 additions & 2 deletions cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@ impl Contains<RuntimeCall> for SafeCallFilter {
WithRococoBulletinMessagesInstance,
>::set_operating_mode { .. }) |
RuntimeCall::EthereumBeaconClient(
snowbridge_ethereum_beacon_client::Call::force_checkpoint { .. } |
snowbridge_ethereum_beacon_client::Call::set_operating_mode { .. },
snowbridge_ethereum_client_pallet::Call::force_checkpoint { .. } |
snowbridge_ethereum_client_pallet::Call::set_operating_mode { .. },
) | RuntimeCall::EthereumInboundQueue(
snowbridge_inbound_queue::Call::set_operating_mode { .. },
) | RuntimeCall::EthereumOutboundQueue(
Expand Down
6 changes: 3 additions & 3 deletions cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/snowbridge.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use codec::Decode;
use cumulus_primitives_core::XcmError::{FailedToTransactAsset, NotHoldingFees};
use frame_support::parameter_types;
use parachains_common::{AccountId, AuraId, Balance};
use snowbridge_ethereum_beacon_client::WeightInfo;
use snowbridge_ethereum_client_pallet::WeightInfo;
use sp_core::H160;
use sp_keyring::AccountKeyring::Alice;

Expand Down Expand Up @@ -101,9 +101,9 @@ pub fn transfer_token_to_ethereum_insufficient_fund() {
fn max_message_queue_service_weight_is_more_than_beacon_extrinsic_weights() {
let max_message_queue_weight = MessageQueueServiceWeight::get();
let force_checkpoint =
<Runtime as snowbridge_ethereum_beacon_client::Config>::WeightInfo::force_checkpoint();
<Runtime as snowbridge_ethereum_client_pallet::Config>::WeightInfo::force_checkpoint();
let submit_checkpoint =
<Runtime as snowbridge_ethereum_beacon_client::Config>::WeightInfo::submit();
<Runtime as snowbridge_ethereum_client_pallet::Config>::WeightInfo::submit();
max_message_queue_weight.all_gt(force_checkpoint);
max_message_queue_weight.all_gt(submit_checkpoint);
}

0 comments on commit 1ba3093

Please sign in to comment.