ethcore/res: remove morden testnet (#11392)

* ethcore/res: remove morden testnet * ethcore: replace morden by ropsten and null_morden * json/spec: rename morden test to null morden * parity/{cli,params}: remove morden testnet * ethcore/engines: fix tests * ethcore/engines: fix test * ethcore/tests: remove `0x` prefix from registrar Co-Authored-By: Andronik Ordian <write@reusable.software> * ethcore/chain: fix tests for ropsten Co-authored-by: Andronik Ordian <write@reusable.software>
openethereum · Jan 28, 2020 · c7c18d0 · c7c18d0
1 parent 1113682
commit c7c18d0
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 2,114 deletions.
diff --git a/ethcore/engines/ethash/src/lib.rs b/ethcore/engines/ethash/src/lib.rs
@@ -505,14 +505,14 @@ mod tests {
 		test_helpers::get_temp_state_db,
 	};
 	use rlp;
-	use spec::{new_morden, new_mcip3_test, new_homestead_test_machine, Spec};
+	use spec::{new_ropsten, new_mcip3_test, new_homestead_test_machine, Spec};
 	use tempdir::TempDir;
 
 	use super::{Ethash, EthashParams, ecip1017_eras_block_reward};
 
 	fn test_spec() -> Spec {
 		let tempdir = TempDir::new("").unwrap();
-		new_morden(&tempdir.path())
+		new_ropsten(&tempdir.path())
 	}
 
 	fn get_default_ethash_params() -> EthashParams {
@@ -553,7 +553,7 @@ mod tests {
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, Address::zero(), (3141562.into(), 31415620.into()), vec![], false).unwrap();
 		let b = b.close().unwrap();
-		assert_eq!(b.state.balance(&Address::zero()).unwrap(), U256::from_str("4563918244f40000").unwrap());
+		assert_eq!(b.state.balance(&Address::zero()).unwrap(), U256::from_str("4563918244f40001").unwrap());
 	}
 
 	#[test]
@@ -607,7 +607,7 @@ mod tests {
 		b.push_uncle(uncle).unwrap();
 
 		let b = b.close().unwrap();
-		assert_eq!(b.state.balance(&Address::zero()).unwrap(), "478eae0e571ba000".into());
+		assert_eq!(b.state.balance(&Address::zero()).unwrap(), "478eae0e571ba001".into());
 		assert_eq!(b.state.balance(&uncle_author).unwrap(), "3cb71f51fc558000".into());
 	}
 
@@ -641,7 +641,7 @@ mod tests {
 		assert!(schedule.stack_limit > 0);
 
 		let schedule = engine.schedule(100);
-		assert!(!schedule.have_delegate_call);
+		assert!(schedule.have_delegate_call);
 	}
 
 	#[test]

diff --git a/ethcore/res/ethereum/morden.json b/ethcore/res/ethereum/morden.json
diff --git a/ethcore/res/null_morden.json b/ethcore/res/null_morden.json
@@ -1,5 +1,6 @@
 {
-	"name": "Morden",
+	"name": "Null Morden",
+	"dataDir": "null_morden",
 	"engine": {
 		"null": {
 			"params": {}

diff --git a/ethcore/res/null_morden_with_finality.json b/ethcore/res/null_morden_with_finality.json
@@ -1,5 +1,6 @@
 {
-	"name": "Morden",
+	"name": "Null Morden with Finality",
+	"dataDir": "null_finality",
 	"engine": {
 		"null": {
 			"params": {

diff --git a/ethcore/res/null_morden_with_reward.json b/ethcore/res/null_morden_with_reward.json
@@ -1,5 +1,6 @@
 {
-	"name": "Morden",
+	"name": "Null Morden with Reward",
+	"dataDir": "null_reward",
 	"engine": {
 		"null": {
 			"params": {

diff --git a/ethcore/spec/src/chain.rs b/ethcore/spec/src/chain.rs
@@ -70,7 +70,6 @@ bundle_release_spec! {
 	"ethereum/kotti" => new_kotti,
 	"ethereum/kovan" => new_kovan,
 	"ethereum/mix" => new_mix,
-	"ethereum/morden" => new_morden,
 	"ethereum/mordor" => new_mordor,
 	"ethereum/musicoin" => new_musicoin,
 	"ethereum/poacore" => new_poanet,
@@ -100,7 +99,6 @@ bundle_test_spec! {
 	"ethereum/homestead_test" => new_homestead_test,
 	"ethereum/kovan_wasm_test" => new_kovan_wasm_test,
 	"ethereum/mcip3_test" => new_mcip3_test,
-	"ethereum/morden" => new_morden_test,
 	"ethereum/mordor" => new_mordor_test,
 	"ethereum/ropsten" => new_ropsten_test,
 	"ethereum/st_peters_test" => new_constantinople_fix_test,
@@ -134,12 +132,12 @@ mod tests {
 	use tempdir::TempDir;
 	use ethcore::test_helpers::get_temp_state_db;
 
-	use super::{new_morden, new_foundation};
+	use super::{new_ropsten, new_foundation};
 
 	#[test]
 	fn ensure_db_good() {
 		let tempdir = TempDir::new("").unwrap();
-		let spec = new_morden(&tempdir.path());
+		let spec = new_ropsten(&tempdir.path());
 		let engine = &spec.engine;
 		let genesis_header = spec.genesis_header();
 		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
@@ -148,18 +146,18 @@ mod tests {
 		assert_eq!(s.balance(&"0000000000000000000000000000000000000002".parse().unwrap()).unwrap(), 1u64.into());
 		assert_eq!(s.balance(&"0000000000000000000000000000000000000003".parse().unwrap()).unwrap(), 1u64.into());
 		assert_eq!(s.balance(&"0000000000000000000000000000000000000004".parse().unwrap()).unwrap(), 1u64.into());
-		assert_eq!(s.balance(&"102e61f5d8f9bc71d0ad4a084df4e65e05ce0e1c".parse().unwrap()).unwrap(), U256::from(1u64) << 200);
-		assert_eq!(s.balance(&"0000000000000000000000000000000000000000".parse().unwrap()).unwrap(), 0u64.into());
+		assert_eq!(s.balance(&"874b54a8bd152966d63f706bae1ffeb0411921e5".parse().unwrap()).unwrap(), U256::from(1000000000000000000000000000000u128));
+		assert_eq!(s.balance(&"0000000000000000000000000000000000000000".parse().unwrap()).unwrap(), 1u64.into());
 	}
 
 	#[test]
-	fn morden() {
+	fn ropsten() {
 		let tempdir = TempDir::new("").unwrap();
-		let morden = new_morden(&tempdir.path());
+		let ropsten = new_ropsten(&tempdir.path());
 
-		assert_eq!(morden.state_root, "f3f4696bbf3b3b07775128eb7a3763279a394e382130f27c21e70233e04946a9".parse().unwrap());
-		let genesis = morden.genesis_block();
-		assert_eq!(view!(BlockView, &genesis).header_view().hash(), "0cd786a2425d16f152c658316c423e6ce1181e15c3295826d7c9904cba9ce303".parse().unwrap());
+		assert_eq!(ropsten.state_root, "217b0bbcfb72e2d57e28f33cb361b9983513177755dc3f33ce3e7022ed62b77b".parse().unwrap());
+		let genesis = ropsten.genesis_block();
+		assert_eq!(view!(BlockView, &genesis).header_view().hash(), "41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d".parse().unwrap());
 	}
 
 	#[test]

diff --git a/ethcore/src/tests/client.rs b/ethcore/src/tests/client.rs
@@ -70,7 +70,7 @@ fn imports_from_empty() {
 fn should_return_registrar() {
 	let db = test_helpers::new_db();
 	let tempdir = TempDir::new("").unwrap();
-	let spec = spec::new_morden(&tempdir.path().to_owned());
+	let spec = spec::new_ropsten(&tempdir.path().to_owned());
 
 	let client = Client::new(
 		ClientConfig::default(),
@@ -80,7 +80,7 @@ fn should_return_registrar() {
 		IoChannel::disconnected(),
 	).unwrap();
 	let address = client.registrar_address();
-	assert_eq!(address, Some("52dff57a8a1532e6afb3dc07e2af58bb9eb05b3d".parse().unwrap()));
+	assert_eq!(address, Some("81a4b044831c4f12ba601adb9274516939e9b8a2".parse().unwrap()));
 }
 
 #[test]

diff --git a/ethcore/verification/src/verification.rs b/ethcore/verification/src/verification.rs
@@ -546,7 +546,7 @@ mod tests {
 	fn test_verify_block() {
 		use rlp::RlpStream;
 
-		// Test against morden
+		// Test against null_morden
 		let mut good = Header::new();
 		let spec = spec::new_test();
 		let engine = &*spec.engine;

diff --git a/json/src/spec/spec.rs b/json/src/spec/spec.rs
@@ -87,7 +87,7 @@ mod tests {
 	#[test]
 	fn should_error_on_unknown_fields() {
 		let s = r#"{
-		"name": "Morden",
+		"name": "Null Morden",
 		"dataDir": "morden",
 		"engine": {
 			"Ethash": {
@@ -152,7 +152,7 @@ mod tests {
 	#[test]
 	fn spec_deserialization() {
 		let s = r#"{
-		"name": "Morden",
+		"name": "Null Morden",
 		"dataDir": "morden",
 		"engine": {
 			"Ethash": {

diff --git a/parity/account_utils.rs b/parity/account_utils.rs
@@ -81,7 +81,7 @@ mod accounts {
 		let account_settings = AccountProviderSettings {
 			unlock_keep_secret: cfg.enable_fast_unlock,
 			blacklisted_accounts: 	match *spec {
-				SpecType::Morden | SpecType::Mordor | SpecType::Ropsten | SpecType::Kovan | SpecType::Goerli | SpecType::Kotti | SpecType::Sokol | SpecType::Dev => vec![],
+				SpecType::Mordor | SpecType::Ropsten | SpecType::Kovan | SpecType::Goerli | SpecType::Kotti | SpecType::Sokol | SpecType::Dev => vec![],
 				_ => vec![
 					H160::from_str("00a329c0648769a73afac7f9381e08fb43dbea72").expect("the string is valid hex; qed"),
 				],

diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs
@@ -300,7 +300,7 @@ usage! {
 
 			ARG arg_chain: (String) = "foundation", or |c: &Config| c.parity.as_ref()?.chain.clone(),
 			"--chain=[CHAIN]",
-			"Specify the blockchain type. CHAIN may be either a JSON chain specification file or ethereum, classic, poacore, xdai, volta, ewc, musicoin, ellaism, mix, callisto, ethercore, morden, mordor, ropsten, kovan, rinkeby, goerli, kotti, poasokol, testnet, evantestcore, evancore or dev.",
+			"Specify the blockchain type. CHAIN may be either a JSON chain specification file or ethereum, classic, poacore, xdai, volta, ewc, musicoin, ellaism, mix, callisto, ethercore, mordor, ropsten, kovan, rinkeby, goerli, kotti, poasokol, testnet, evantestcore, evancore or dev.",
 
 			ARG arg_keys_path: (String) = "$BASE/keys", or |c: &Config| c.parity.as_ref()?.keys_path.clone(),
 			"--keys-path=[PATH]",

diff --git a/parity/params.rs b/parity/params.rs
@@ -44,7 +44,6 @@ pub enum SpecType {
 	Mix,
 	Callisto,
 	EtherCore,
-	Morden,
 	Mordor,
 	Ropsten,
 	Kovan,
@@ -80,7 +79,6 @@ impl str::FromStr for SpecType {
 			"mix" => SpecType::Mix,
 			"callisto" => SpecType::Callisto,
 			"ethercore" => SpecType::EtherCore,
-			"morden" => SpecType::Morden,
 			"mordor" | "classic-testnet" => SpecType::Mordor,
 			"ropsten" => SpecType::Ropsten,
 			"kovan" => SpecType::Kovan,
@@ -111,7 +109,6 @@ impl fmt::Display for SpecType {
 			SpecType::Mix => "mix",
 			SpecType::Callisto => "callisto",
 			SpecType::EtherCore => "ethercore",
-			SpecType::Morden => "morden",
 			SpecType::Mordor => "mordor",
 			SpecType::Ropsten => "ropsten",
 			SpecType::Kovan => "kovan",
@@ -142,7 +139,6 @@ impl SpecType {
 			SpecType::Mix => Ok(spec::new_mix(params)),
 			SpecType::Callisto => Ok(spec::new_callisto(params)),
 			SpecType::EtherCore => Ok(spec::new_ethercore(params)),
-			SpecType::Morden => Ok(spec::new_morden(params)),
 			SpecType::Mordor => Ok(spec::new_mordor(params)),
 			SpecType::Ropsten => Ok(spec::new_ropsten(params)),
 			SpecType::Kovan => Ok(spec::new_kovan(params)),
@@ -402,7 +398,6 @@ mod tests {
 		assert_eq!(SpecType::Mix, "mix".parse().unwrap());
 		assert_eq!(SpecType::Callisto, "callisto".parse().unwrap());
 		assert_eq!(SpecType::EtherCore, "ethercore".parse().unwrap());
-		assert_eq!(SpecType::Morden, "morden".parse().unwrap());
 		assert_eq!(SpecType::Mordor, "mordor".parse().unwrap());
 		assert_eq!(SpecType::Mordor, "classic-testnet".parse().unwrap());
 		assert_eq!(SpecType::Ropsten, "ropsten".parse().unwrap());
@@ -436,7 +431,6 @@ mod tests {
 		assert_eq!(format!("{}", SpecType::Mix), "mix");
 		assert_eq!(format!("{}", SpecType::Callisto), "callisto");
 		assert_eq!(format!("{}", SpecType::EtherCore), "ethercore");
-		assert_eq!(format!("{}", SpecType::Morden), "morden");
 		assert_eq!(format!("{}", SpecType::Mordor), "mordor");
 		assert_eq!(format!("{}", SpecType::Ropsten), "ropsten");
 		assert_eq!(format!("{}", SpecType::Kovan), "kovan");