Move check for aura/grandpa only keys one level higher

Author: LGLO

toolkit/smart-contracts/plutus-data/src/registered_candidates.rs

@@ -111,16 +111,27 @@ impl VersionedDatumWithLegacy for RegisterValidatorDatum {
 pub fn candidate_registration_to_plutus_data(
 	candidate_registration: &CandidateRegistration,
 ) -> PlutusData {
-	RegisterValidatorDatum::V0 {
-		stake_ownership: candidate_registration.stake_ownership.clone(),
-		sidechain_pub_key: candidate_registration.partner_chain_pub_key.clone(),
-		sidechain_signature: candidate_registration.partner_chain_signature.clone(),
-		registration_utxo: candidate_registration.registration_utxo,
-		own_pkh: candidate_registration.own_pkh,
-		aura_pub_key: AuraPublicKey(candidate_registration.keys.find_or_empty(AURA)),
-		grandpa_pub_key: GrandpaPublicKey(candidate_registration.keys.find_or_empty(GRANDPA)),
-	}
-	.into()
+	let datum = if candidate_registration.keys.has_only_aura_and_grandpa_keys() {
+		RegisterValidatorDatum::V0 {
+			stake_ownership: candidate_registration.stake_ownership.clone(),
+			sidechain_pub_key: candidate_registration.partner_chain_pub_key.clone(),
+			sidechain_signature: candidate_registration.partner_chain_signature.clone(),
+			registration_utxo: candidate_registration.registration_utxo,
+			own_pkh: candidate_registration.own_pkh,
+			aura_pub_key: AuraPublicKey(candidate_registration.keys.find_or_empty(AURA)),
+			grandpa_pub_key: GrandpaPublicKey(candidate_registration.keys.find_or_empty(GRANDPA)),
+		}
+	} else {
+		RegisterValidatorDatum::V1 {
+			stake_ownership: candidate_registration.stake_ownership.clone(),
+			sidechain_pub_key: candidate_registration.partner_chain_pub_key.clone(),
+			sidechain_signature: candidate_registration.partner_chain_signature.clone(),
+			registration_utxo: candidate_registration.registration_utxo,
+			own_pkh: candidate_registration.own_pkh,
+			keys: candidate_registration.keys.clone(),
+		}
+	};
+	datum.into()
 }
 
 impl From<RegisterValidatorDatum> for CandidateRegistration {
@@ -312,19 +323,12 @@ impl From<RegisterValidatorDatum> for PlutusData {
 				appendix_fields.add(&PlutusData::new_bytes(sidechain_pub_key.0));
 				appendix_fields.add(&PlutusData::new_bytes(sidechain_signature.0));
 				appendix_fields.add(&utxo_id_to_plutus_data(registration_utxo));
-				let version = if keys.has_only_aura_and_grandpa_keys() {
-					appendix_fields.add(&PlutusData::new_bytes(keys.find_or_empty(AURA)));
-					appendix_fields.add(&PlutusData::new_bytes(keys.find_or_empty(GRANDPA)));
-					0
-				} else {
-					appendix_fields.add(&candidate_keys_to_plutus(&keys));
-					1
-				};
+				appendix_fields.add(&candidate_keys_to_plutus(&keys));
 				let appendix = ConstrPlutusData::new(&BigNum::zero(), &appendix_fields);
 				VersionedGenericDatum {
 					datum: PlutusData::new_bytes(own_pkh.0.to_vec()),
 					appendix: PlutusData::new_constr_plutus_data(&appendix),
-					version,
+					version: 1,
 				}
 				.into()
 			},
@@ -377,33 +381,6 @@ mod tests {
 		}
 	}
 
-	fn test_datum_v1_aura_and_grandpa_only() -> RegisterValidatorDatum {
-		RegisterValidatorDatum::V1 {
-			stake_ownership: AdaBasedStaking {
-				pub_key: StakePoolPublicKey(hex!("bfbee74ab533f40979101057f96de62e95233f2a5216eb16b54106f09fd7350d")),
-				signature: MainchainSignature(hex!("28d1c3b7df297a60d24a3f88bc53d7029a8af35e8dd876764fd9e7a24203a3482a98263cc8ba2ddc7dc8e7faea31c2e7bad1f00e28c43bc863503e3172dc6b0a").into()),
-			},
-			sidechain_pub_key: SidechainPublicKey(hex!("02fe8d1eb1bcb3432b1db5833ff5f2226d9cb5e65cee430558c18ed3a3c86ce1af").into()),
-			sidechain_signature: SidechainSignature(hex!("f8ec6c7f935d387aaa1693b3bf338cbb8f53013da8a5a234f9c488bacac01af259297e69aee0df27f553c0a1164df827d016125c16af93c99be2c19f36d2f66e").into()),
-			registration_utxo: UtxoId {
-				tx_hash: McTxHash(hex!("cdefe62b0a0016c2ccf8124d7dda71f6865283667850cc7b471f761d2bc1eb13")),
-				index: UtxoIndex(1),
-			},
-			own_pkh: MainchainKeyHash(hex!("aabbccddeeff00aabbccddeeff00aabbccddeeff00aabbccddeeff00")),
-			keys: CandidateKeys(vec![
-					CandidateKey::new(AURA,
-						hex!("d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d")
-							.into(),
-					),
-					CandidateKey::new(
-						GRANDPA,
-						hex!("88dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee")
-							.into(),
-					),
-				])
-		}
-	}
-
 	fn test_datum_v1() -> RegisterValidatorDatum {
 		RegisterValidatorDatum::V1 {
 			stake_ownership: AdaBasedStaking {
@@ -541,20 +518,14 @@ mod tests {
 	}
 
 	#[test]
-	fn valid_v1_registration_to_plutus_data() {
-		let plutus_data: PlutusData = test_datum_v1().into();
-		assert_eq!(plutus_data_to_json(plutus_data), test_versioned_datum_v1_json())
-	}
-
-	#[test]
-	fn valid_v1_registration_to_plutus_data_outputs_v0_for_aura_and_grandpa_only() {
-		let plutus_data: PlutusData = test_datum_v1_aura_and_grandpa_only().into();
+	fn v0_registration_to_plutus_data() {
+		let plutus_data: PlutusData = test_datum_v0().into();
 		assert_eq!(plutus_data_to_json(plutus_data), test_versioned_datum_v0_json())
 	}
 
 	#[test]
-	fn v0_registration_to_plutus_data() {
-		let plutus_data: PlutusData = test_datum_v0().into();
-		assert_eq!(plutus_data_to_json(plutus_data), test_versioned_datum_v0_json())
+	fn valid_v1_registration_to_plutus_data() {
+		let plutus_data: PlutusData = test_datum_v1().into();
+		assert_eq!(plutus_data_to_json(plutus_data), test_versioned_datum_v1_json())
 	}
 }