Remove Default bound for AccountId

Cargo.toml

@@ -80,7 +80,6 @@ members = [
 	"frame/contracts/rpc/runtime-api",
 	"frame/democracy",
 	"frame/try-runtime",
-	"frame/elections",
 	"frame/election-provider-multi-phase",
 	"frame/election-provider-support",
 	"frame/examples/basic",

bin/node-template/node/src/chain_spec.rs

@@ -147,7 +147,7 @@ fn testnet_genesis(
 		},
 		sudo: SudoConfig {
 			// Assign network admin rights.
-			key: root_key,
+			key: Some(root_key),
 		},
 		transaction_payment: Default::default(),
 	}

bin/node/cli/src/chain_spec.rs

@@ -338,7 +338,7 @@ pub fn testnet_genesis(
 				.collect(),
 			phantom: Default::default(),
 		},
-		sudo: SudoConfig { key: root_key },
+		sudo: SudoConfig { key: Some(root_key) },
 		babe: BabeConfig {
 			authorities: vec![],
 			epoch_config: Some(node_runtime::BABE_GENESIS_EPOCH_CONFIG),

bin/node/executor/tests/submit_transaction.rs

@@ -33,7 +33,8 @@ fn should_submit_unsigned_transaction() {
 	t.register_extension(TransactionPoolExt::new(pool));
 
 	t.execute_with(|| {
-		let signature = Default::default();
+		let signature =
+			pallet_im_online::sr25519::AuthoritySignature::try_from(vec![0; 64]).unwrap();
 		let heartbeat_data = pallet_im_online::Heartbeat {
 			block_number: 1,
 			network_state: Default::default(),

bin/node/runtime/src/impls.rs

@@ -27,7 +27,9 @@ use pallet_asset_tx_payment::HandleCredit;
 pub struct Author;
 impl OnUnbalanced<NegativeImbalance> for Author {
 	fn on_nonzero_unbalanced(amount: NegativeImbalance) {
-		Balances::resolve_creating(&Authorship::author(), amount);
+		if let Some(author) = Authorship::author() {
+			Balances::resolve_creating(&author, amount);
+		}
 	}
 }
 
@@ -36,9 +38,10 @@ impl OnUnbalanced<NegativeImbalance> for Author {
 pub struct CreditToBlockAuthor;
 impl HandleCredit<AccountId, Assets> for CreditToBlockAuthor {
 	fn handle_credit(credit: CreditOf<AccountId, Assets>) {
-		let author = pallet_authorship::Pallet::<Runtime>::author();
-		// Drop the result which will trigger the `OnDrop` of the imbalance in case of error.
-		let _ = Assets::resolve(&author, credit);
+		if let Some(author) = pallet_authorship::Pallet::<Runtime>::author() {
+			// Drop the result which will trigger the `OnDrop` of the imbalance in case of error.
+			let _ = Assets::resolve(&author, credit);
+		}
 	}
 }
 

bin/node/runtime/src/lib.rs

@@ -1782,7 +1782,7 @@ mod tests {
 	#[test]
 	fn call_size() {
 		assert!(
-			core::mem::size_of::<Call>() <= 200,
+			core::mem::size_of::<Call>() <= 208,
 			"size of Call is more than 200 bytes: some calls have too big arguments, use Box to reduce the
 			size of Call.
 			If the limit is too strong, maybe consider increase the limit to 300.",

bin/utils/chain-spec-builder/src/main.rs

@@ -29,7 +29,7 @@ use structopt::StructOpt;
 use node_cli::chain_spec::{self, AccountId};
 use sc_keystore::LocalKeystore;
 use sp_core::{
-	crypto::{Public, Ss58Codec},
+	crypto::{ByteArray, Ss58Codec},
 	sr25519,
 };
 use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};

client/basic-authorship/src/basic_authorship.rs

@@ -581,7 +581,7 @@ mod tests {
 			amount: Default::default(),
 			nonce,
 			from: AccountKeyring::Alice.into(),
-			to: Default::default(),
+			to: AccountKeyring::Bob.into(),
 		}
 		.into_signed_tx()
 	}
@@ -593,7 +593,7 @@ mod tests {
 			amount: 1,
 			nonce: 0,
 			from: pair.public(),
-			to: Default::default(),
+			to: AccountKeyring::Bob.into(),
 		};
 		let signature = pair.sign(&transfer.encode()).into();
 		Extrinsic::Transfer { transfer, signature, exhaust_resources_when_not_first: true }
@@ -777,14 +777,14 @@ mod tests {
 					amount: Default::default(),
 					nonce: 2,
 					from: AccountKeyring::Alice.into(),
-					to: Default::default(),
+					to: AccountKeyring::Bob.into(),
 				}.into_resources_exhausting_tx(),
 				extrinsic(3),
 				Transfer {
 					amount: Default::default(),
 					nonce: 4,
 					from: AccountKeyring::Alice.into(),
-					to: Default::default(),
+					to: AccountKeyring::Bob.into(),
 				}.into_resources_exhausting_tx(),
 				extrinsic(5),
 				extrinsic(6),

client/cli/src/commands/insert_key.rs

@@ -99,7 +99,7 @@ fn to_vec<P: sp_core::Pair>(uri: &str, pass: Option<SecretString>) -> Result<Vec
 mod tests {
 	use super::*;
 	use sc_service::{ChainSpec, ChainType, GenericChainSpec, NoExtension};
-	use sp_core::{sr25519::Pair, Pair as _, Public};
+	use sp_core::{sr25519::Pair, ByteArray, Pair as _};
 	use structopt::StructOpt;
 	use tempfile::TempDir;
 

client/cli/src/commands/verify.rs

@@ -19,7 +19,7 @@
 //! implementation of the `verify` subcommand
 
 use crate::{error, utils, with_crypto_scheme, CryptoSchemeFlag};
-use sp_core::{crypto::Ss58Codec, Public};
+use sp_core::crypto::{ByteArray, Ss58Codec};
 use structopt::StructOpt;
 
 /// The `verify` command
@@ -66,19 +66,14 @@ impl VerifyCmd {
 fn verify<Pair>(sig_data: Vec<u8>, message: Vec<u8>, uri: &str) -> error::Result<()>
 where
 	Pair: sp_core::Pair,
-	Pair::Signature: Default + AsMut<[u8]>,
+	Pair::Signature: for<'a> std::convert::TryFrom<&'a [u8]>,
 {
-	let mut signature = Pair::Signature::default();
-	if sig_data.len() != signature.as_ref().len() {
-		return Err(error::Error::SignatureInvalidLength {
-			read: sig_data.len(),
-			expected: signature.as_ref().len(),
-		})
-	}
-	signature.as_mut().copy_from_slice(&sig_data);
+	let signature =
+		Pair::Signature::try_from(&sig_data).map_err(|_| error::Error::SignatureFormatInvalid)?;
 
 	let pubkey = if let Ok(pubkey_vec) = hex::decode(uri) {
 		Pair::Public::from_slice(pubkey_vec.as_slice())
+			.map_err(|_| error::Error::KeyFormatInvalid)?
 	} else {
 		Pair::Public::from_string(uri)?
 	};

client/cli/src/error.rs

@@ -51,13 +51,11 @@ pub enum Error {
 	#[error("Invalid URI; expecting either a secret URI or a public URI.")]
 	InvalidUri(crypto::PublicError),
 
-	#[error("Signature has an invalid length. Read {read} bytes, expected {expected} bytes")]
-	SignatureInvalidLength {
-		/// Amount of signature bytes read.
-		read: usize,
-		/// Expected number of signature bytes.
-		expected: usize,
-	},
+	#[error("Signature is an invalid format.")]
+	SignatureFormatInvalid,
+
+	#[error("Key is an invalid format.")]
+	KeyFormatInvalid,
 
 	#[error("Unknown key type, must be a known 4-character sequence")]
 	KeyTypeInvalid,

client/consensus/aura/src/lib.rs

@@ -57,7 +57,7 @@ use sp_consensus::{
 	BlockOrigin, CanAuthorWith, Environment, Error as ConsensusError, Proposer, SelectChain,
 };
 use sp_consensus_slots::Slot;
-use sp_core::crypto::{Pair, Public};
+use sp_core::crypto::{ByteArray, Pair, Public};
 use sp_inherents::CreateInherentDataProviders;
 use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 use sp_runtime::{

client/consensus/babe/rpc/src/lib.rs

@@ -30,7 +30,7 @@ use sp_application_crypto::AppKey;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 use sp_consensus::{Error as ConsensusError, SelectChain};
 use sp_consensus_babe::{digests::PreDigest, AuthorityId, BabeApi as BabeRuntimeApi};
-use sp_core::crypto::Public;
+use sp_core::crypto::ByteArray;
 use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 use sp_runtime::traits::{Block as BlockT, Header as _};
 use std::{collections::HashMap, sync::Arc};

client/consensus/babe/src/authorship.rs

@@ -27,7 +27,7 @@ use sp_consensus_babe::{
 	make_transcript, make_transcript_data, AuthorityId, BabeAuthorityWeight, Slot, BABE_VRF_PREFIX,
 };
 use sp_consensus_vrf::schnorrkel::{VRFOutput, VRFProof};
-use sp_core::{blake2_256, crypto::Public, U256};
+use sp_core::{blake2_256, crypto::ByteArray, U256};
 use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 
 /// Calculates the primary selection threshold for a given authority, taking

client/consensus/babe/src/lib.rs

@@ -110,7 +110,7 @@ use sp_consensus::{
 };
 use sp_consensus_babe::inherents::BabeInherentData;
 use sp_consensus_slots::Slot;
-use sp_core::{crypto::Public, ExecutionContext};
+use sp_core::{crypto::ByteArray, ExecutionContext};
 use sp_inherents::{CreateInherentDataProviders, InherentData, InherentDataProvider};
 use sp_keystore::{SyncCryptoStore, SyncCryptoStorePtr};
 use sp_runtime::{

client/consensus/babe/src/verification.rs

@@ -31,7 +31,7 @@ use sp_consensus_babe::{
 	make_transcript, AuthorityId, AuthorityPair, AuthoritySignature,
 };
 use sp_consensus_slots::Slot;
-use sp_core::{Pair, Public};
+use sp_core::{ByteArray, Pair};
 use sp_runtime::{traits::Header, DigestItem};
 
 /// BABE verification parameters

client/finality-grandpa/rpc/src/lib.rs

@@ -179,7 +179,7 @@ mod tests {
 		report, AuthorityId, FinalityProof, GrandpaJustification, GrandpaJustificationSender,
 	};
 	use sp_blockchain::HeaderBackend;
-	use sp_core::crypto::Public;
+	use sp_core::crypto::ByteArray;
 	use sp_keyring::Ed25519Keyring;
 	use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 	use substrate_test_runtime_client::{
@@ -196,8 +196,8 @@ mod tests {
 	}
 
 	fn voters() -> HashSet<AuthorityId> {
-		let voter_id_1 = AuthorityId::from_slice(&[1; 32]);
-		let voter_id_2 = AuthorityId::from_slice(&[2; 32]);
+		let voter_id_1 = AuthorityId::from_slice(&[1; 32]).unwrap();
+		let voter_id_2 = AuthorityId::from_slice(&[2; 32]).unwrap();
 
 		vec![voter_id_1, voter_id_2].into_iter().collect()
 	}
@@ -245,7 +245,7 @@ mod tests {
 
 	impl ReportVoterState for TestVoterState {
 		fn get(&self) -> Option<report::VoterState<AuthorityId>> {
-			let voter_id_1 = AuthorityId::from_slice(&[1; 32]);
+			let voter_id_1 = AuthorityId::from_slice(&[1; 32]).unwrap();
 			let voters_best: HashSet<_> = vec![voter_id_1].into_iter().collect();
 
 			let best_round_state = sc_finality_grandpa::report::RoundState {

client/finality-grandpa/src/authorities.rs

@@ -753,7 +753,7 @@ impl<N: Ord + Clone> AuthoritySetChanges<N> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use sp_core::crypto::Public;
+	use sp_core::crypto::{ByteArray, UncheckedFrom};
 
 	fn static_is_descendent_of<A>(value: bool) -> impl Fn(&A, &A) -> Result<bool, std::io::Error> {
 		move |_, _| Ok(value)
@@ -768,7 +768,7 @@ mod tests {
 
 	#[test]
 	fn current_limit_filters_min() {
-		let current_authorities = vec![(AuthorityId::from_slice(&[1; 32]), 1)];
+		let current_authorities = vec![(AuthorityId::from_slice(&[1; 32]).unwrap(), 1)];
 
 		let mut authorities = AuthoritySet {
 			current_authorities: current_authorities.clone(),
@@ -802,7 +802,7 @@ mod tests {
 
 	#[test]
 	fn changes_iterated_in_pre_order() {
-		let current_authorities = vec![(AuthorityId::from_slice(&[1; 32]), 1)];
+		let current_authorities = vec![(AuthorityId::from_slice(&[1; 32]).unwrap(), 1)];
 
 		let mut authorities = AuthoritySet {
 			current_authorities: current_authorities.clone(),
@@ -894,8 +894,8 @@ mod tests {
 			authority_set_changes: AuthoritySetChanges::empty(),
 		};
 
-		let set_a = vec![(AuthorityId::from_slice(&[1; 32]), 5)];
-		let set_b = vec![(AuthorityId::from_slice(&[2; 32]), 5)];
+		let set_a = vec![(AuthorityId::from_slice(&[1; 32]).unwrap(), 5)];
+		let set_b = vec![(AuthorityId::from_slice(&[2; 32]).unwrap(), 5)];
 
 		// two competing changes at the same height on different forks
 		let change_a = PendingChange {
@@ -977,8 +977,8 @@ mod tests {
 			authority_set_changes: AuthoritySetChanges::empty(),
 		};
 
-		let set_a = vec![(AuthorityId::from_slice(&[1; 32]), 5)];
-		let set_c = vec![(AuthorityId::from_slice(&[2; 32]), 5)];
+		let set_a = vec![(AuthorityId::from_slice(&[1; 32]).unwrap(), 5)];
+		let set_c = vec![(AuthorityId::from_slice(&[2; 32]).unwrap(), 5)];
 
 		// two competing changes at the same height on different forks
 		let change_a = PendingChange {
@@ -1057,7 +1057,7 @@ mod tests {
 			authority_set_changes: AuthoritySetChanges::empty(),
 		};
 
-		let set_a = vec![(AuthorityId::from_slice(&[1; 32]), 5)];
+		let set_a = vec![(AuthorityId::from_slice(&[1; 32]).unwrap(), 5)];
 
 		let change_a = PendingChange {
 			next_authorities: set_a.clone(),
@@ -1128,8 +1128,8 @@ mod tests {
 			authority_set_changes: AuthoritySetChanges::empty(),
 		};
 
-		let set_a = vec![(AuthorityId::from_slice(&[1; 32]), 5)];
-		let set_b = vec![(AuthorityId::from_slice(&[2; 32]), 5)];
+		let set_a = vec![(AuthorityId::from_slice(&[1; 32]).unwrap(), 5)];
+		let set_b = vec![(AuthorityId::from_slice(&[2; 32]).unwrap(), 5)];
 
 		let change_a = PendingChange {
 			next_authorities: set_a.clone(),
@@ -1228,7 +1228,7 @@ mod tests {
 			authority_set_changes: AuthoritySetChanges::empty(),
 		};
 
-		let set_a = vec![(AuthorityId::from_slice(&[1; 32]), 5)];
+		let set_a = vec![(AuthorityId::from_slice(&[1; 32]).unwrap(), 5)];
 
 		// we create a forced change with no delay
 		let change_a = PendingChange {
@@ -1253,7 +1253,7 @@ mod tests {
 
 	#[test]
 	fn forced_changes_blocked_by_standard_changes() {
-		let set_a = vec![(AuthorityId::from_slice(&[1; 32]), 1)];
+		let set_a = vec![(AuthorityId::from_slice(&[1; 32]).unwrap(), 1)];
 
 		let mut authorities = AuthoritySet {
 			current_authorities: set_a.clone(),
@@ -1378,7 +1378,7 @@ mod tests {
 
 	#[test]
 	fn next_change_works() {
-		let current_authorities = vec![(AuthorityId::from_slice(&[1; 32]), 1)];
+		let current_authorities = vec![(AuthorityId::from_slice(&[1; 32]).unwrap(), 1)];
 
 		let mut authorities = AuthoritySet {
 			current_authorities: current_authorities.clone(),
@@ -1493,8 +1493,10 @@ mod tests {
 			None,
 		);
 
-		let invalid_authorities_weight =
-			vec![(AuthorityId::from_slice(&[1; 32]), 5), (AuthorityId::from_slice(&[2; 32]), 0)];
+		let invalid_authorities_weight = vec![
+			(AuthorityId::from_slice(&[1; 32]).unwrap(), 5),
+			(AuthorityId::from_slice(&[2; 32]).unwrap(), 0),
+		];
 
 		// authority weight of zero is invalid
 		assert_eq!(AuthoritySet::<(), ()>::genesis(invalid_authorities_weight.clone()), None);
@@ -1510,7 +1512,8 @@ mod tests {
 		);
 
 		let mut authority_set =
-			AuthoritySet::<(), u64>::genesis(vec![(AuthorityId::from_slice(&[1; 32]), 5)]).unwrap();
+			AuthoritySet::<(), u64>::genesis(vec![(AuthorityId::unchecked_from([1; 32]), 5)])
+				.unwrap();
 
 		let invalid_change_empty_authorities = PendingChange {
 			next_authorities: vec![],
@@ -1550,7 +1553,7 @@ mod tests {
 
 	#[test]
 	fn cleans_up_stale_forced_changes_when_applying_standard_change() {
-		let current_authorities = vec![(AuthorityId::from_slice(&[1; 32]), 1)];
+		let current_authorities = vec![(AuthorityId::from_slice(&[1; 32]).unwrap(), 1)];
 
 		let mut authorities = AuthoritySet {
 			current_authorities: current_authorities.clone(),