updated unit tests

pallets/creditcoin/src/helpers.rs

@@ -189,10 +189,10 @@ fn extract_public_key_eth_sign<T: Config>(
 				sp_core::ecdsa::Public::from_raw(public_key),
 			) {
 				Some(s) => Ok(s),
-				None => Err(Error::MalformedExternalAddress),
+				None => Err(Error::EthSignExternalAddressGenerationFailed),
 			}
 		},
-		Err(_) => Err(Error::EthSignPublicKeyRecoveryFailed),
+		Err(_) => Err(Error::InvalidSignature),
 	}
 }
 
@@ -224,10 +224,10 @@ pub fn extract_public_key_personal_sign<T: Config>(
 				sp_core::ecdsa::Public::from_raw(public_key),
 			) {
 				Some(s) => Ok(s),
-				None => Err(Error::MalformedExternalAddress),
+				None => Err(Error::PersonalSignExternalAddressGenerationFailed),
 			}
 		},
-		Err(_) => Err(Error::PersonalSignPublicKeyRecoveryFailed),
+		Err(_) => Err(Error::InvalidSignature),
 	}
 }
 
@@ -245,3 +245,12 @@ fn test_extract_public_key_personal_sign() {
 
 	assert_eq!(message.as_slice(), expected_hash.as_slice());
 }
+
+pub fn blockchain_is_supported(blockchain: &Blockchain) -> bool {
+	match blockchain {
+		Blockchain::Luniverse | Blockchain::Ethereum | Blockchain::Rinkeby => true,
+		Blockchain::Bitcoin => false,
+		Blockchain::Other(_) => false,
+		_ => false,
+	}
+}

pallets/creditcoin/src/lib.rs

@@ -507,6 +507,9 @@ pub mod pallet {
 
 		/// ECDSA public key recovery failed for an ownership proof using PersonalSign
 		PersonalSignPublicKeyRecoveryFailed,
+
+		/// An unsupported blockchain was specified to register_address_v2
+		UnsupportedBlockchain,
 	}
 
 	#[pallet::genesis_config]
@@ -1378,10 +1381,19 @@ pub mod pallet {
 			ownership_proof: OwnershipProof,
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
-
 			let encoded = who.encode();
 			let account = encoded.as_slice();
 
+			ensure!(
+				helpers::blockchain_is_supported(&blockchain),
+				Error::<T>::UnsupportedBlockchain
+			);
+
+			ensure!(
+				helpers::address_is_well_formed(&blockchain, &address),
+				Error::<T>::MalformedExternalAddress
+			);
+
 			match helpers::try_extract_address::<T>(ownership_proof, account, &blockchain, &address)
 			{
 				Ok(recreated_address) => {
@@ -1399,13 +1411,6 @@ pub mod pallet {
 						fail!(Error::<T>::AddressAlreadyRegistered);
 					}
 
-					// note: this error condition is unreachable!
-					// AddressFormatNotSupported or OwnershipNotSatisfied will error out first
-					ensure!(
-						helpers::address_is_well_formed(&blockchain, &address),
-						Error::<T>::MalformedExternalAddress
-					);
-
 					let entry = Address { blockchain, value: address, owner: who };
 					Self::deposit_event(Event::<T>::AddressRegistered(
 						address_id.clone(),

pallets/creditcoin/src/tests.rs

@@ -3026,7 +3026,7 @@ fn register_address_v2_should_fail_to_reregister_external_address_to_same_accoun
 				Origin::signed(who),
 				blockchain,
 				external_address,
-				proof.clone(),
+				proof,
 			),
 			crate::Error::<Test>::AddressAlreadyRegisteredByCaller
 		);
@@ -3126,7 +3126,7 @@ fn try_extract_address_should_error_when_signature_is_invalid() {
 		let blockchain = Blockchain::Rinkeby;
 		assert_noop!(
 			Creditcoin::register_address_v2(Origin::signed(who), blockchain, address, bad_proof),
-			crate::Error::<Test>::EthSignPublicKeyRecoveryFailed
+			crate::Error::<Test>::InvalidSignature
 		);
 	})
 }
@@ -3153,7 +3153,7 @@ fn register_address_v2_should_fail_after_v1_registration_with_same_addres() {
 				Origin::signed(who),
 				blockchain,
 				external_address,
-				proof.clone(),
+				proof,
 			),
 			crate::Error::<Test>::AddressAlreadyRegisteredByCaller
 		);
@@ -3181,7 +3181,7 @@ fn register_address_v1_should_fail_after_v2_registration_with_same_addres() {
 				Origin::signed(who),
 				blockchain,
 				external_address,
-				ownership_proof.clone(),
+				ownership_proof,
 			),
 			crate::Error::<Test>::AddressAlreadyRegisteredByCaller
 		);
@@ -3220,3 +3220,19 @@ fn register_address_v2_should_work_personal_sign() {
 		);
 	});
 }
+
+#[test]
+fn register_address_v2_should_error_with_unsupported_blockchain() {
+	ExtBuilder::default().build_and_execute(|| {
+		System::set_block_number(1);
+
+		let (who, address, ownership_proof, _) = generate_address_with_proof("owner");
+		let blockchain = Blockchain::Bitcoin;
+		let proof = OwnershipProof::EthSign(ownership_proof);
+
+		assert_noop!(
+			Creditcoin::register_address_v2(Origin::signed(who), blockchain, address, proof,),
+			crate::Error::<Test>::UnsupportedBlockchain
+		);
+	});
+}