update resolving conflcits

bin/node-template/runtime/Cargo.toml

@@ -56,9 +56,9 @@ substrate-wasm-builder = { version = "5.0.0-dev", path = "../../../utils/wasm-bu
 [features]
 default = ["std"]
 std = [
-	"frame-try-runtime?/std",
-	"frame-system-benchmarking?/std",
-	"frame-benchmarking?/std",
+	"frame-try-runtime/std",
+	"frame-system-benchmarking/std",
+	"frame-benchmarking/std",
 	"codec/std",
 	"scale-info/std",
 	"frame-executive/std",

client/beefy/rpc/src/lib.rs

@@ -170,7 +170,7 @@ mod tests {
 		communication::notification::BeefyVersionedFinalityProofSender,
 		justification::BeefyVersionedFinalityProof,
 	};
-	use beefy_primitives::{known_payloads, Payload, SignedCommitment};
+	use sp_beefy::{known_payloads, Payload, SignedCommitment};
 	use codec::{Decode, Encode};
 	use jsonrpsee::{types::EmptyServerParams as EmptyParams, RpcModule};
 	use sp_runtime::traits::{BlakeTwo256, Hash};
@@ -269,7 +269,7 @@ mod tests {
 		let payload =
 			Payload::from_single_entry(known_payloads::MMR_ROOT_ID, "Hello World!".encode());
 		BeefyVersionedFinalityProof::<Block>::V1(SignedCommitment {
-			commitment: beefy_primitives::Commitment {
+			commitment: sp_beefy::Commitment {
 				payload,
 				block_number: 5,
 				validator_set_id: 0,

client/beefy/rpc/src/notification.rs

@@ -23,7 +23,7 @@ use sp_runtime::traits::Block as BlockT;
 
 /// An encoded finality proof proving that the given header has been finalized.
 /// The given bytes should be the SCALE-encoded representation of a
-/// `beefy_primitives::VersionedFinalityProof`.
+/// `sp_beefy::VersionedFinalityProof`.
 #[derive(Clone, Serialize, Deserialize)]
 pub struct EncodedVersionedFinalityProof(sp_core::Bytes);
 

client/beefy/src/communication/gossip.rs

@@ -29,7 +29,7 @@ use parking_lot::{Mutex, RwLock};
 use wasm_timer::Instant;
 
 use crate::{communication::peers::KnownPeers, keystore::BeefyKeystore};
-use beefy_primitives::{
+use sp_beefy::{
 	crypto::{Public, Signature},
 	VoteMessage,
 };
@@ -240,7 +240,7 @@ mod tests {
 	use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 
 	use crate::keystore::{tests::Keyring, BeefyKeystore};
-	use beefy_primitives::{
+	use sp_beefy::{
 		crypto::Signature, known_payloads, Commitment, MmrRootHash, Payload, VoteMessage, KEY_TYPE,
 	};
 

client/beefy/src/communication/request_response/incoming_requests_handler.rs

@@ -16,7 +16,7 @@
 
 //! Helper for handling (i.e. answering) BEEFY justifications requests from a remote peer.
 
-use beefy_primitives::BEEFY_ENGINE_ID;
+use sp_beefy::BEEFY_ENGINE_ID;
 use codec::Decode;
 use futures::{
 	channel::{mpsc, oneshot},

client/beefy/src/communication/request_response/outgoing_requests_engine.rs

@@ -18,7 +18,7 @@
 
 //! Generating request logic for request/response protocol for syncing BEEFY justifications.
 
-use beefy_primitives::{crypto::AuthorityId, ValidatorSet};
+use sp_beefy::{crypto::AuthorityId, ValidatorSet};
 use codec::Encode;
 use futures::channel::{oneshot, oneshot::Canceled};
 use log::{debug, warn};

client/beefy/src/import.rs

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use beefy_primitives::{BeefyApi, BEEFY_ENGINE_ID};
+use sp_beefy::{BeefyApi, BEEFY_ENGINE_ID};
 use log::debug;
 use std::{collections::HashMap, sync::Arc};
 

client/beefy/src/justification.rs

@@ -17,7 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::keystore::BeefyKeystore;
-use beefy_primitives::{
+use sp_beefy::{
 	crypto::{AuthorityId, Signature},
 	ValidatorSet, VersionedFinalityProof,
 };
@@ -27,7 +27,7 @@ use sp_runtime::traits::{Block as BlockT, NumberFor};
 
 /// A finality proof with matching BEEFY authorities' signatures.
 pub type BeefyVersionedFinalityProof<Block> =
-	beefy_primitives::VersionedFinalityProof<NumberFor<Block>, Signature>;
+	sp_beefy::VersionedFinalityProof<NumberFor<Block>, Signature>;
 
 /// Decode and verify a Beefy FinalityProof.
 pub(crate) fn decode_and_verify_finality_proof<Block: BlockT>(
@@ -80,7 +80,7 @@ fn verify_with_validator_set<Block: BlockT>(
 
 #[cfg(test)]
 pub(crate) mod tests {
-	use beefy_primitives::{
+	use sp_beefy::{
 		known_payloads, Commitment, Payload, SignedCommitment, VersionedFinalityProof,
 	};
 	use substrate_test_runtime_client::runtime::Block;

client/beefy/src/keystore.rs

@@ -23,7 +23,7 @@ use sp_runtime::traits::Keccak256;
 
 use log::warn;
 
-use beefy_primitives::{
+use sp_beefy::{
 	crypto::{Public, Signature},
 	BeefyVerify, KEY_TYPE,
 };
@@ -117,7 +117,7 @@ pub mod tests {
 	use sp_core::{ecdsa, keccak_256, Pair};
 	use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 
-	use beefy_primitives::{crypto, KEY_TYPE};
+	use sp_beefy::{crypto, KEY_TYPE};
 
 	use super::BeefyKeystore;
 	use crate::error::Error;

client/beefy/src/lib.rs

@@ -31,7 +31,7 @@ use crate::{
 	round::Rounds,
 	worker::PersistedState,
 };
-use beefy_primitives::{
+use sp_beefy::{
 	crypto::AuthorityId, BeefyApi, MmrRootHash, PayloadProvider, ValidatorSet, BEEFY_ENGINE_ID,
 	GENESIS_AUTHORITY_SET_ID,
 };

client/beefy/src/round.rs

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use beefy_primitives::{
+use sp_beefy::{
 	crypto::{Public, Signature},
 	ValidatorSet, ValidatorSetId,
 };
@@ -174,7 +174,7 @@ mod tests {
 	use sc_network_test::Block;
 	use sp_core::H256;
 
-	use beefy_primitives::{crypto::Public, ValidatorSet};
+	use sp_beefy::{crypto::Public, ValidatorSet};
 
 	use super::{threshold, Block as BlockT, Hash, RoundTracker, Rounds};
 	use crate::keystore::tests::Keyring;

client/beefy/src/tests.rs

@@ -30,7 +30,7 @@ use crate::{
 	load_or_init_voter_state, wait_for_runtime_pallet, BeefyRPCLinks, BeefyVoterLinks, KnownPeers,
 	PersistedState,
 };
-use beefy_primitives::{
+use sp_beefy::{
 	crypto::{AuthorityId, Signature},
 	known_payloads,
 	mmr::MmrRootProvider,
@@ -475,7 +475,7 @@ fn wait_for_beefy_signed_commitments(
 			let expected = expected.next();
 			async move {
 				let signed_commitment = match versioned_finality_proof {
-					beefy_primitives::VersionedFinalityProof::V1(sc) => sc,
+					sp_beefy::VersionedFinalityProof::V1(sc) => sc,
 				};
 				let commitment_block_num = signed_commitment.commitment.block_number;
 				assert_eq!(expected, Some(commitment_block_num).as_ref());

client/beefy/src/worker.rs

@@ -29,7 +29,7 @@ use crate::{
 	round::Rounds,
 	BeefyVoterLinks,
 };
-use beefy_primitives::{
+use sp_beefy::{
 	crypto::{AuthorityId, Signature},
 	Commitment, ConsensusLog, Payload, PayloadProvider, SignedCommitment, ValidatorSet,
 	VersionedFinalityProof, VoteMessage, BEEFY_ENGINE_ID,
@@ -970,7 +970,7 @@ pub(crate) mod tests {
 		},
 		BeefyRPCLinks, KnownPeers,
 	};
-	use beefy_primitives::{known_payloads, mmr::MmrRootProvider};
+	use sp_beefy::{known_payloads, mmr::MmrRootProvider};
 	use futures::{future::poll_fn, task::Poll};
 	use parking_lot::Mutex;
 	use sc_client_api::{Backend as BackendT, HeaderBackend};

client/merkle-mountain-range/src/lib.rs

@@ -43,7 +43,7 @@ mod offchain_mmr;
 pub mod test_utils;
 
 use crate::offchain_mmr::OffchainMmr;
-use beefy_primitives::MmrRootHash;
+use sp_beefy::MmrRootHash;
 use futures::StreamExt;
 use log::{debug, error, trace, warn};
 use sc_client_api::{Backend, BlockchainEvents, FinalityNotifications};

frame/beefy-mmr/src/lib.rs

@@ -36,7 +36,7 @@
 use sp_runtime::traits::{Convert, Member};
 use sp_std::prelude::*;
 
-use beefy_primitives::{
+use sp_beefy::{
 	mmr::{BeefyAuthoritySet, BeefyDataProvider, BeefyNextAuthoritySet, MmrLeaf, MmrLeafVersion},
 	ValidatorSet as BeefyValidatorSet,
 };
@@ -54,15 +54,15 @@ mod tests;
 /// A BEEFY consensus digest item with MMR root hash.
 pub struct DepositBeefyDigest<T>(sp_std::marker::PhantomData<T>);
 
-impl<T> pallet_mmr::primitives::OnNewRoot<beefy_primitives::MmrRootHash> for DepositBeefyDigest<T>
+impl<T> pallet_mmr::primitives::OnNewRoot<sp_beefy::MmrRootHash> for DepositBeefyDigest<T>
 where
-	T: pallet_mmr::Config<Hash = beefy_primitives::MmrRootHash>,
+	T: pallet_mmr::Config<Hash = sp_beefy::MmrRootHash>,
 	T: pallet_beefy::Config,
 {
 	fn on_new_root(root: &<T as pallet_mmr::Config>::Hash) {
 		let digest = sp_runtime::generic::DigestItem::Consensus(
-			beefy_primitives::BEEFY_ENGINE_ID,
-			codec::Encode::encode(&beefy_primitives::ConsensusLog::<
+			sp_beefy::BEEFY_ENGINE_ID,
+			codec::Encode::encode(&sp_beefy::ConsensusLog::<
 				<T as pallet_beefy::Config>::BeefyId,
 			>::MmrRoot(*root)),
 		);
@@ -72,8 +72,8 @@ where
 
 /// Convert BEEFY secp256k1 public keys into Ethereum addresses
 pub struct BeefyEcdsaToEthereum;
-impl Convert<beefy_primitives::crypto::AuthorityId, Vec<u8>> for BeefyEcdsaToEthereum {
-	fn convert(beefy_id: beefy_primitives::crypto::AuthorityId) -> Vec<u8> {
+impl Convert<sp_beefy::crypto::AuthorityId, Vec<u8>> for BeefyEcdsaToEthereum {
+	fn convert(beefy_id: sp_beefy::crypto::AuthorityId) -> Vec<u8> {
 		sp_core::ecdsa::Public::from(beefy_id)
 			.to_eth_address()
 			.map(|v| v.to_vec())
@@ -156,7 +156,7 @@ impl<T: Config> LeafDataProvider for Pallet<T> {
 	}
 }
 
-impl<T> beefy_primitives::OnNewValidatorSet<<T as pallet_beefy::Config>::BeefyId> for Pallet<T>
+impl<T> sp_beefy::OnNewValidatorSet<<T as pallet_beefy::Config>::BeefyId> for Pallet<T>
 where
 	T: pallet::Config,
 {

frame/beefy-mmr/src/mock.rs

@@ -17,7 +17,7 @@
 
 use std::vec;
 
-use beefy_primitives::mmr::MmrLeafVersion;
+use sp_beefy::mmr::MmrLeafVersion;
 use codec::Encode;
 use frame_support::{
 	construct_runtime, parameter_types,
@@ -35,7 +35,7 @@ use sp_runtime::{
 
 use crate as pallet_beefy_mmr;
 
-pub use beefy_primitives::{
+pub use sp_beefy::{
 	crypto::AuthorityId as BeefyId, mmr::BeefyDataProvider, ConsensusLog, BEEFY_ENGINE_ID,
 };
 
@@ -101,7 +101,7 @@ impl pallet_session::Config for Test {
 	type WeightInfo = ();
 }
 
-pub type MmrLeaf = beefy_primitives::mmr::MmrLeaf<
+pub type MmrLeaf = sp_beefy::mmr::MmrLeaf<
 	<Test as frame_system::Config>::BlockNumber,
 	<Test as frame_system::Config>::Hash,
 	<Test as pallet_mmr::Config>::Hash,

frame/beefy-mmr/src/tests.rs

@@ -17,7 +17,7 @@
 
 use std::vec;
 
-use beefy_primitives::{
+use sp_beefy::{
 	mmr::{BeefyNextAuthoritySet, MmrLeafVersion},
 	ValidatorSet,
 };

frame/beefy/src/lib.rs

@@ -32,7 +32,7 @@ use sp_runtime::{
 };
 use sp_std::prelude::*;
 
-use beefy_primitives::{
+use sp_beefy::{
 	AuthorityIndex, ConsensusLog, OnNewValidatorSet, ValidatorSet, BEEFY_ENGINE_ID,
 	GENESIS_AUTHORITY_SET_ID,
 };
@@ -83,7 +83,7 @@ pub mod pallet {
 	#[pallet::storage]
 	#[pallet::getter(fn validator_set_id)]
 	pub(super) type ValidatorSetId<T: Config> =
-		StorageValue<_, beefy_primitives::ValidatorSetId, ValueQuery>;
+		StorageValue<_, sp_beefy::ValidatorSetId, ValueQuery>;
 
 	/// Authorities set scheduled to be used with the next session
 	#[pallet::storage]
@@ -118,7 +118,7 @@ impl<T: Config> Pallet<T> {
 	/// Return the current active BEEFY validator set.
 	pub fn validator_set() -> Option<ValidatorSet<T::BeefyId>> {
 		let validators: BoundedVec<T::BeefyId, T::MaxAuthorities> = Self::authorities();
-		let id: beefy_primitives::ValidatorSetId = Self::validator_set_id();
+		let id: sp_beefy::ValidatorSetId = Self::validator_set_id();
 		ValidatorSet::<T::BeefyId>::new(validators, id)
 	}
 

frame/beefy/src/mock.rs

@@ -34,7 +34,7 @@ use sp_runtime::{
 
 use crate as pallet_beefy;
 
-pub use beefy_primitives::{crypto::AuthorityId as BeefyId, ConsensusLog, BEEFY_ENGINE_ID};
+pub use sp_beefy::{crypto::AuthorityId as BeefyId, ConsensusLog, BEEFY_ENGINE_ID};
 
 impl_opaque_keys! {
 	pub struct MockSessionKeys {

frame/beefy/src/tests.rs

@@ -17,7 +17,7 @@
 
 use std::vec;
 
-use beefy_primitives::ValidatorSet;
+use sp_beefy::ValidatorSet;
 use codec::Encode;
 
 use sp_runtime::DigestItem;

primitives/consensus/aura/src/lib.rs

@@ -23,6 +23,8 @@ use codec::{Codec, Decode, Encode};
 use sp_runtime::ConsensusEngineId;
 use sp_std::vec::Vec;
 
+use scale_info::prelude::format;
+
 pub mod digests;
 pub mod inherents;
 

test-utils/runtime/src/lib.rs

@@ -1002,18 +1002,18 @@ cfg_if! {
 				}
 			}
 
-			impl beefy_primitives::BeefyApi<Block> for Runtime {
-				fn validator_set() -> Option<beefy_primitives::ValidatorSet<beefy_primitives::crypto::AuthorityId>> {
+			impl sp_beefy::BeefyApi<Block> for Runtime {
+				fn validator_set() -> Option<sp_beefy::ValidatorSet<sp_beefy::crypto::AuthorityId>> {
 					None
 				}
 			}
 
-			impl beefy_merkle_tree::BeefyMmrApi<Block, beefy_primitives::MmrRootHash> for Runtime {
-				fn authority_set_proof() -> beefy_primitives::mmr::BeefyAuthoritySet<beefy_primitives::MmrRootHash> {
+			impl beefy_merkle_tree::BeefyMmrApi<Block, sp_beefy::MmrRootHash> for Runtime {
+				fn authority_set_proof() -> sp_beefy::mmr::BeefyAuthoritySet<sp_beefy::MmrRootHash> {
 					Default::default()
 				}
 
-				fn next_authority_set_proof() -> beefy_primitives::mmr::BeefyNextAuthoritySet<beefy_primitives::MmrRootHash> {
+				fn next_authority_set_proof() -> sp_beefy::mmr::BeefyNextAuthoritySet<sp_beefy::MmrRootHash> {
 					Default::default()
 				}
 			}