pub use WeightInfo in Grandpa + Messsages pallets (#1370)

bridges/modules/grandpa/src/lib.rs

@@ -36,8 +36,6 @@
 // Runtime-generated enums
 #![allow(clippy::large_enum_variant)]
 
-use crate::weights::WeightInfo;
-
 use bp_header_chain::{justification::GrandpaJustification, InitializationData};
 use bp_runtime::{BlockNumberOf, Chain, HashOf, HasherOf, HeaderOf};
 use finality_grandpa::voter_set::VoterSet;
@@ -58,6 +56,7 @@ pub mod benchmarking;
 
 // Re-export in crate namespace for `construct_runtime!`
 pub use pallet::*;
+pub use weights::WeightInfo;
 
 /// Block number of the bridged chain.
 pub type BridgedBlockNumber<T, I> = BlockNumberOf<<T as Config<I>>::BridgedChain>;

bridges/modules/messages/src/lib.rs

@@ -37,7 +37,8 @@
 // Generated by `decl_event!`
 #![allow(clippy::unused_unit)]
 
-pub use crate::weights_ext::{
+pub use weights::WeightInfo;
+pub use weights_ext::{
 	ensure_able_to_receive_confirmation, ensure_able_to_receive_message,
 	ensure_weights_are_correct, WeightInfoExt, EXPECTED_DEFAULT_MESSAGE_LENGTH,
 };
@@ -45,7 +46,6 @@ pub use crate::weights_ext::{
 use crate::{
 	inbound_lane::{InboundLane, InboundLaneStorage, ReceivalResult},
 	outbound_lane::{OutboundLane, OutboundLaneStorage, ReceivalConfirmationResult},
-	weights::WeightInfo,
 };
 
 use bp_messages::{