Merge pull request #24 from ZeroDAO/dev

1. Fixed e2e bugs.
2. Added frame_system_ext pallet unit tests.

crates/core-primitives/Cargo.toml

@@ -30,6 +30,7 @@ sc-client-api = {optional = true, default-features = false, git = "https://githu
 sc-offchain = {optional = true, default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
 
 # For testing
+lazy_static = "1.4"
 rand = { version = "0.8.5", optional = true }
 sp-application-crypto = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
 

crates/core-primitives/src/testing.rs

@@ -16,9 +16,11 @@
 // limitations under the License.
 
 //! Testing utilities.
+use crate::HeaderExtension;
 use crate::traits::ExtendedHeader;
 use crate::traits::HeaderCommitList;
 use crate::Header as HeaderT;
+use lazy_static::lazy_static;
 use melo_das_primitives::KZGCommitment;
 
 use serde::{de::Error as DeError, Deserialize, Deserializer, Serialize, Serializer};
@@ -44,6 +46,17 @@ use std::{
 	ops::Deref,
 };
 
+lazy_static! {
+	pub static ref TEST_COMMITMENTS: Vec<KZGCommitment> = vec![
+		KZGCommitment::rand(),
+		KZGCommitment::rand(),
+		KZGCommitment::rand(),
+		KZGCommitment::rand(),
+		KZGCommitment::rand(),
+		KZGCommitment::rand(),
+	];
+}
+
 pub struct CommitListTest();
 
 impl HeaderCommitList for CommitListTest {
@@ -52,6 +65,30 @@ impl HeaderCommitList for CommitListTest {
 	}
 }
 
+pub struct CommitListTestWithData();
+
+impl HeaderCommitList for CommitListTestWithData {
+	fn last() -> Vec<KZGCommitment> {
+		TEST_COMMITMENTS.to_vec()
+	}
+}
+
+impl CommitListTestWithData {
+	pub fn commit_bytes() -> Vec<u8> {
+		TEST_COMMITMENTS
+			.iter()
+			.map(|c| c.to_bytes())
+			.flatten()
+			.collect()
+	}
+
+	pub fn header_extension() -> HeaderExtension {
+		HeaderExtension {
+			commitments_bytes: Self::commit_bytes(),
+		}
+	}
+}
+
 /// A dummy type which can be used instead of regular cryptographic primitives.
 ///
 /// 1. Wraps a `u64` `AccountId` and is able to `IdentifyAccount`.

crates/frame-executive-ext/src/lib.rs

@@ -692,8 +692,8 @@ mod tests {
 	use pallet_transaction_payment::CurrencyAdapter;
 
 	use melo_core_primitives::{
-		testing::{Block, Digest, CommitListTest},
-		Header as ExtendedHeader,
+		testing::{Block, CommitListTestWithData, Digest},
+		Header as ExtendedHeader, HeaderExtension,
 	};
 
 	const TEST_KEY: &[u8] = b":test:key:";
@@ -906,7 +906,7 @@ mod tests {
 	}
 
 	impl frame_system_ext::Config for Runtime {
-		type CommitList = CommitListTest;
+		type CommitList = CommitListTestWithData;
 		type ExtendedHeader = Header;
 	}
 
@@ -984,6 +984,10 @@ mod tests {
 		RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest, value })
 	}
 
+	fn extension_test() -> HeaderExtension {
+		CommitListTestWithData::header_extension()
+	}
+
 	#[test]
 	fn balance_transfer_dispatch_works() {
 		let mut t = frame_system::GenesisConfig::default().build_storage::<Runtime>().unwrap();
@@ -1055,7 +1059,7 @@ mod tests {
 						"03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314",
 					),
 					digest: Digest { logs: vec![] },
-					extension: Default::default(),
+					extension: extension_test(),
 				},
 				extrinsics: vec![],
 			});
@@ -1075,7 +1079,7 @@ mod tests {
 						"03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314",
 					),
 					digest: Digest { logs: vec![] },
-					extension: Default::default(),
+					extension: extension_test(),
 				},
 				extrinsics: vec![],
 			});
@@ -1095,7 +1099,7 @@ mod tests {
 					),
 					extrinsics_root: [0u8; 32].into(),
 					digest: Digest { logs: vec![] },
-					extension: Default::default(),
+					extension: extension_test(),
 				},
 				extrinsics: vec![],
 			});

crates/frame-system-ext/Cargo.toml

@@ -21,6 +21,10 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"]}
 serde = { version = "1.0.136", features = ["derive"], optional = true }
 
+[dev-dependencies]
+sp-io = { version = "7.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
+sp-core = { version = "7.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
+
 [features]
 default = ["std"]
 std = [

crates/frame-system-ext/src/lib.rs

@@ -63,3 +63,79 @@ impl<T: Config> Pallet<T> {
 		ext_header
 	}
 }
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use crate as frame_system_ext;
+	use frame_support::{
+		parameter_types,
+		traits::{ConstU32, ConstU64},
+	};
+	use melo_core_primitives::{testing::CommitListTestWithData, Header as ExtendedHeader};
+	use sp_core::H256;
+	use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
+
+	parameter_types! {
+		pub const BlockHashCount: u64 = 250;
+	}
+
+	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
+	type Block = frame_system::mocking::MockBlock<Runtime>;
+
+	pub type Header = ExtendedHeader<u64, BlakeTwo256>;
+
+	// Mock runtime to test the module.
+	frame_support::construct_runtime! {
+		pub struct Runtime where
+			Block = Block,
+			NodeBlock = Block,
+			UncheckedExtrinsic = UncheckedExtrinsic,
+		{
+			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+			SystemExt: frame_system_ext::{Pallet},
+		}
+	}
+
+	impl frame_system::Config for Runtime {
+		type BaseCallFilter = frame_support::traits::Everything;
+		type BlockWeights = ();
+		type BlockLength = ();
+		type DbWeight = ();
+		type RuntimeOrigin = RuntimeOrigin;
+		type Index = u64;
+		type BlockNumber = u64;
+		type RuntimeCall = RuntimeCall;
+		type Hash = H256;
+		type Hashing = BlakeTwo256;
+		type AccountId = u64;
+		type Lookup = IdentityLookup<Self::AccountId>;
+		type Header = Header;
+		type RuntimeEvent = RuntimeEvent;
+		type BlockHashCount = ConstU64<250>;
+		type Version = ();
+		type PalletInfo = PalletInfo;
+		type AccountData = ();
+		type OnNewAccount = ();
+		type OnKilledAccount = ();
+		type SystemWeightInfo = ();
+		type SS58Prefix = ();
+		type OnSetCode = ();
+		type MaxConsumers = ConstU32<16>;
+	}
+
+	impl Config for Runtime {
+		type ExtendedHeader = Header; // Mocked or a concrete type can be provided
+		type CommitList = CommitListTestWithData; // Mocked or a concrete type can be provided
+	}
+
+	#[test]
+	fn finalize_works() {
+		let mut ext = sp_io::TestExternalities::new_empty();
+
+		ext.execute_with(|| {
+			let header = SystemExt::finalize();
+			assert_eq!(header.extension, CommitListTestWithData::header_extension());
+		});
+	}
+}