Use runtime storage in PoA -> Substrate module tests (paritytech#103)

* removeInMemoryStorage + extract Kovan stuff to runtime * removed comment from the future * remove redundant conversions * remove redundant `u8 as usize` * remove redundant `u8 as usize` * Update modules/ethereum/src/mock.rs Co-authored-by: Hernando Castano <[email protected]> * use hex-literal in kovan config * cargo fmt --all * extracted insert_header * cargo fmt --all Co-authored-by: Hernando Castano <[email protected]>
serban300 · Apr 8, 2024 · 1f5e507 · 1f5e507
1 parent de5804c
commit 1f5e507
Show file tree

Hide file tree

Showing 11 changed files with 690 additions and 876 deletions.
diff --git a/bridges/bin/node/node/src/chain_spec.rs b/bridges/bin/node/node/src/chain_spec.rs
@@ -169,85 +169,8 @@ fn testnet_genesis(
 
 fn load_kovan_config() -> Option<BridgeEthPoAConfig> {
 	Some(BridgeEthPoAConfig {
-		initial_header: sp_bridge_eth_poa::Header {
-			parent_hash: Default::default(),
-			timestamp: 0,
-			number: 0,
-			author: Default::default(),
-			transactions_root: "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-				.parse()
-				.unwrap(),
-			uncles_hash: "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-				.parse()
-				.unwrap(),
-			extra_data: vec![],
-			state_root: "2480155b48a1cea17d67dbfdfaafe821c1d19cdd478c5358e8ec56dec24502b2"
-				.parse()
-				.unwrap(),
-			receipts_root: "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
-				.parse()
-				.unwrap(),
-			log_bloom: Default::default(),
-			gas_used: Default::default(),
-			gas_limit: 6000000.into(),
-			difficulty: 131072.into(),
-			seal: vec![
-				vec![128].into(),
-				vec![
-					184, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-					0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-					0, 0,
-				]
-				.into(),
-			],
-		},
+		initial_header: bridge_node_runtime::kovan::kovan_genesis_header(),
 		initial_difficulty: 0.into(),
-		initial_validators: vec![
-			[
-				0x00, 0xD6, 0xCc, 0x1B, 0xA9, 0xcf, 0x89, 0xBD, 0x2e, 0x58, 0x00, 0x97, 0x41, 0xf4, 0xF7, 0x32, 0x5B,
-				0xAd, 0xc0, 0xED,
-			]
-			.into(),
-			[
-				0x00, 0x42, 0x7f, 0xea, 0xe2, 0x41, 0x9c, 0x15, 0xb8, 0x9d, 0x1c, 0x21, 0xaf, 0x10, 0xd1, 0xb6, 0x65,
-				0x0a, 0x4d, 0x3d,
-			]
-			.into(),
-			[
-				0x4E, 0xd9, 0xB0, 0x8e, 0x63, 0x54, 0xC7, 0x0f, 0xE6, 0xF8, 0xCB, 0x04, 0x11, 0xb0, 0xd3, 0x24, 0x6b,
-				0x42, 0x4d, 0x6c,
-			]
-			.into(),
-			[
-				0x00, 0x20, 0xee, 0x4B, 0xe0, 0xe2, 0x02, 0x7d, 0x76, 0x60, 0x3c, 0xB7, 0x51, 0xeE, 0x06, 0x95, 0x19,
-				0xbA, 0x81, 0xA1,
-			]
-			.into(),
-			[
-				0x00, 0x10, 0xf9, 0x4b, 0x29, 0x6a, 0x85, 0x2a, 0xaa, 0xc5, 0x2e, 0xa6, 0xc5, 0xac, 0x72, 0xe0, 0x3a,
-				0xfd, 0x03, 0x2d,
-			]
-			.into(),
-			[
-				0x00, 0x77, 0x33, 0xa1, 0xFE, 0x69, 0xCF, 0x3f, 0x2C, 0xF9, 0x89, 0xF8, 0x1C, 0x7b, 0x4c, 0xAc, 0x16,
-				0x93, 0x38, 0x7A,
-			]
-			.into(),
-			[
-				0x00, 0xE6, 0xd2, 0xb9, 0x31, 0xF5, 0x5a, 0x3f, 0x17, 0x01, 0xc7, 0x38, 0x9d, 0x59, 0x2a, 0x77, 0x78,
-				0x89, 0x78, 0x79,
-			]
-			.into(),
-			[
-				0x00, 0xe4, 0xa1, 0x06, 0x50, 0xe5, 0xa6, 0xD6, 0x00, 0x1C, 0x38, 0xff, 0x8E, 0x64, 0xF9, 0x70, 0x16,
-				0xa1, 0x64, 0x5c,
-			]
-			.into(),
-			[
-				0x00, 0xa0, 0xa2, 0x4b, 0x9f, 0x0e, 0x5e, 0xc7, 0xaa, 0x4c, 0x73, 0x89, 0xb8, 0x30, 0x2f, 0xd0, 0x12,
-				0x31, 0x94, 0xde,
-			]
-			.into(),
-		],
+		initial_validators: bridge_node_runtime::kovan::kovan_genesis_validators(),
 	})
 }
diff --git a/bridges/bin/node/runtime/Cargo.toml b/bridges/bin/node/runtime/Cargo.toml
@@ -6,6 +6,9 @@ edition = "2018"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/parity-bridges-common/"
 
+[dependencies]
+hex-literal = "0.2"
+
 [dependencies.codec]
 package = "parity-scale-codec"
 version = "1.0.0"

diff --git a/bridges/bin/node/runtime/src/kovan.rs b/bridges/bin/node/runtime/src/kovan.rs
@@ -0,0 +1,104 @@
+// Copyright 2019-2020 Parity Technologies (UK) Ltd.
+// This file is part of Parity Bridges Common.
+
+// Parity Bridges Common is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Bridges Common is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Bridges Common.  If not, see <http://www.gnu.org/licenses/>.
+
+use hex_literal::hex;
+use pallet_bridge_eth_poa::{AuraConfiguration, ValidatorsConfiguration, ValidatorsSource};
+use sp_bridge_eth_poa::{Address, Header, U256};
+use sp_std::prelude::*;
+
+/// Aura engine configuration for Kovan chain.
+pub fn kovan_aura_configuration() -> AuraConfiguration {
+	AuraConfiguration {
+		empty_steps_transition: u64::max_value(),
+		strict_empty_steps_transition: 0,
+		validate_step_transition: 0x16e360,
+		validate_score_transition: 0x41a3c4,
+		two_thirds_majority_transition: u64::max_value(),
+		min_gas_limit: 0x1388.into(),
+		max_gas_limit: U256::max_value(),
+		maximum_extra_data_size: 0x20,
+	}
+}
+
+/// Validators configuration for Kovan chain.
+pub fn kovan_validators_configuration() -> ValidatorsConfiguration {
+	ValidatorsConfiguration::Multi(vec![
+		(0, ValidatorsSource::List(kovan_genesis_validators())),
+		(
+			10960440,
+			ValidatorsSource::List(vec![
+				hex!("00D6Cc1BA9cf89BD2e58009741f4F7325BAdc0ED").into(),
+				hex!("0010f94b296a852aaac52ea6c5ac72e03afd032d").into(),
+				hex!("00a0a24b9f0e5ec7aa4c7389b8302fd0123194de").into(),
+			]),
+		),
+		(
+			10960500,
+			ValidatorsSource::Contract(
+				hex!("aE71807C1B0a093cB1547b682DC78316D945c9B8").into(),
+				vec![
+					hex!("d05f7478c6aa10781258c5cc8b4f385fc8fa989c").into(),
+					hex!("03801efb0efe2a25ede5dd3a003ae880c0292e4d").into(),
+					hex!("a4df255ecf08bbf2c28055c65225c9a9847abd94").into(),
+					hex!("596e8221a30bfe6e7eff67fee664a01c73ba3c56").into(),
+					hex!("faadface3fbd81ce37b0e19c0b65ff4234148132").into(),
+				],
+			),
+		),
+	])
+}
+
+/// Genesis validators set of Kovan chain.
+pub fn kovan_genesis_validators() -> Vec<Address> {
+	vec![
+		hex!("00D6Cc1BA9cf89BD2e58009741f4F7325BAdc0ED").into(),
+		hex!("00427feae2419c15b89d1c21af10d1b6650a4d3d").into(),
+		hex!("4Ed9B08e6354C70fE6F8CB0411b0d3246b424d6c").into(),
+		hex!("0020ee4Be0e2027d76603cB751eE069519bA81A1").into(),
+		hex!("0010f94b296a852aaac52ea6c5ac72e03afd032d").into(),
+		hex!("007733a1FE69CF3f2CF989F81C7b4cAc1693387A").into(),
+		hex!("00E6d2b931F55a3f1701c7389d592a7778897879").into(),
+		hex!("00e4a10650e5a6D6001C38ff8E64F97016a1645c").into(),
+		hex!("00a0a24b9f0e5ec7aa4c7389b8302fd0123194de").into(),
+	]
+}
+
+/// Genesis header of the Kovan chain.
+pub fn kovan_genesis_header() -> Header {
+	Header {
+		parent_hash: Default::default(),
+		timestamp: 0,
+		number: 0,
+		author: Default::default(),
+		transactions_root: hex!("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421").into(),
+		uncles_hash: hex!("1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347").into(),
+		extra_data: vec![],
+		state_root: hex!("2480155b48a1cea17d67dbfdfaafe821c1d19cdd478c5358e8ec56dec24502b2").into(),
+		receipts_root: hex!("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421").into(),
+		log_bloom: Default::default(),
+		gas_used: Default::default(),
+		gas_limit: 6000000.into(),
+		difficulty: 131072.into(),
+		seal: vec![
+			vec![128].into(),
+			vec![
+				184, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+				0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			]
+			.into(),
+		],
+	}
+}
diff --git a/bridges/bin/node/runtime/src/lib.rs b/bridges/bin/node/runtime/src/lib.rs
@@ -24,6 +24,8 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
+pub mod kovan;
+
 use codec::{Decode, Encode};
 use pallet_grandpa::fg_primitives;
 use pallet_grandpa::AuthorityList as GrandpaAuthorityList;
@@ -204,7 +206,14 @@ impl pallet_aura::Trait for Runtime {
 	type AuthorityId = AuraId;
 }
 
+parameter_types! {
+	pub const KovanAuraConfiguration: pallet_bridge_eth_poa::AuraConfiguration = kovan::kovan_aura_configuration();
+	pub const KovanValidatorsConfiguration: pallet_bridge_eth_poa::ValidatorsConfiguration = kovan::kovan_validators_configuration();
+}
+
 impl pallet_bridge_eth_poa::Trait for Runtime {
+	type AuraConfiguration = KovanAuraConfiguration;
+	type ValidatorsConfiguration = KovanValidatorsConfiguration;
 	type OnHeadersSubmitted = ();
 }