more unit tests

app-libs/parentchain-interface/src/extrinsic_parser.rs

@@ -75,15 +75,15 @@ where
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use ita_sgx_runtime::opaque::UncheckedExtrinsic;
-	use itp_api_client_types::{ParentchainSignature, ParentchainTxExtension, Signature};
-	use itp_utils::FromHexPrefixed;
+	use itp_api_client_types::{ParentchainPlainTip, ParentchainSignature, ParentchainTxExtension};
+	use itp_types::Nonce;
 	use sp_core::crypto::AccountId32;
 	use sp_runtime::{generic::Era, OpaqueExtrinsic};
+	use substrate_api_client::ac_primitives::GenericTxExtension;
 
 	#[test]
 	#[allow(deprecated)]
-	fn can_parse_v4_extrinsic() {
+	fn can_parse_v4_unsigned_extrinsic() {
 		use substrate_api_client::ac_primitives::extrinsics::deprecated::UncheckedExtrinsicV4 as XTV4;
 
 		let ex_v4: XTV4<Address, _, ParentchainSignature, ()> = XTV4::new_unsigned([1u8, 2u8]);
@@ -101,13 +101,55 @@ mod tests {
 	}
 
 	#[test]
-	fn can_parse_v5_extrinsic() {
+	#[allow(deprecated)]
+	fn can_parse_v4_signed_extrinsic() {
+		use substrate_api_client::ac_primitives::extrinsics::deprecated::UncheckedExtrinsicV4 as XTV4;
+
+		let (address, extension, signature) = get_default_signer_data();
+
+		let ex_v4: XTV4<Address, _, ParentchainSignature, ParentchainTxExtension> =
+			XTV4::new_signed([1u8, 2u8], address.clone(), signature.clone(), extension.clone());
+
+		let encoded = ex_v4.encode();
+
+		let parsed = ExtrinsicParser::<ParentchainTxExtension>::parse(&encoded).unwrap();
+
+		match &parsed.preamble {
+			Preamble::Signed(addr, sig, ext) => {
+				assert_eq!(addr, &address);
+				assert_eq!(sig, &signature);
+				assert_eq!(ext, &extension);
+			},
+			other => panic!("unexpected preamble: {:?}", other),
+		};
+
+		assert_eq!(parsed.call_index, [1, 2]);
+	}
+
+	#[test]
+	fn can_parse_v5_bare_extrinsic() {
 		use substrate_api_client::ac_primitives::extrinsics::UncheckedExtrinsic as XTV5;
 
-		let address = Address::Id(AccountId32::new([0; 32]));
-		let extension = ParentchainTxExtension::new(Era::Immortal, 1, Default::default());
-		let signature =
-			ParentchainSignature::Ed25519([0u8; 64].encode().as_slice().try_into().unwrap());
+		let ex_v5: XTV5<Address, _, ParentchainSignature, ParentchainTxExtension> =
+			XTV5::new_bare([1u8, 2u8, 0, 0, 0]);
+
+		let encoded = ex_v5.encode();
+
+		let parsed = ExtrinsicParser::<ParentchainTxExtension>::parse(&encoded).unwrap();
+
+		match &parsed.preamble {
+			Preamble::Bare(5) => {},
+			other => panic!("unexpected preamble: {:?}", other),
+		};
+
+		assert_eq!(parsed.call_index, [1, 2]);
+	}
+
+	#[test]
+	fn can_parse_v5_signed_extrinsic() {
+		use substrate_api_client::ac_primitives::extrinsics::UncheckedExtrinsic as XTV5;
+
+		let (address, extension, signature) = get_default_signer_data();
 
 		let ex_v5: XTV5<Address, _, ParentchainSignature, ParentchainTxExtension> =
 			XTV5::new_signed(
@@ -137,10 +179,7 @@ mod tests {
 	fn opaque_extrinsic_works() {
 		use substrate_api_client::ac_primitives::extrinsics::UncheckedExtrinsic as XTV5;
 
-		let address = Address::Id(AccountId32::new([0; 32]));
-		let extension = ParentchainTxExtension::new(Era::Immortal, 1, Default::default());
-		let signature =
-			ParentchainSignature::Ed25519([0u8; 64].encode().as_slice().try_into().unwrap());
+		let (address, extension, signature) = get_default_signer_data();
 
 		let ex_v5: XTV5<Address, _, ParentchainSignature, ParentchainTxExtension> =
 			XTV5::new_signed(
@@ -160,17 +199,13 @@ mod tests {
 		assert_eq!(ex_v5, decoded);
 	}
 
-	// #[test]
-	// fn can_parse_register_enclave() {
-	// 	let encoded = "0x81028400d345e01893ae2c5c600675fe7b901e0b32641b3b4405772ed5eb227228ab535700d0168da6e0bd8c5657616e8b4641d47f2cd7bcbe9f76846d6a65e006d995fff1ef2b42f7e3418c9dec75bb7bae07ece61dc0255ad19879cefae88bb8c575180515000000320080fec01d23e7fe3f1db1b7740e3bc01013b330797b2ae97b589604393fc1d005f101487773733a2f2f302e302e302e303a323030300000";
-	// 	let xt = OpaqueExtrinsic::from_hex(encoded).unwrap();
-	//
-	// 	let parsed = ExtrinsicParser::<ParentchainTxExtension>::parse(&encoded.as_bytes()).unwrap();
-	//
-	// 	match parsed.preamble {
-	// 		Preamble::General(_, _) => (),
-	// 		other => panic!("unexpected preamble: {:?}", other),
-	// 	};
-	//
-	// }
+	fn get_default_signer_data(
+	) -> (Address, GenericTxExtension<ParentchainPlainTip, Nonce>, ParentchainSignature) {
+		let address = Address::Id(AccountId32::new([0; 32]));
+		let extension = ParentchainTxExtension::new(Era::Immortal, 1, Default::default());
+		let signature =
+			ParentchainSignature::Ed25519([0u8; 64].encode().as_slice().try_into().unwrap());
+
+		(address, extension, signature)
+	}
 }