Remove enumerate_trie_root in favour of ordered_trie_root #2382 (#3360)

substrate/core/executor/runtime-test/src/lib.rs

@@ -9,7 +9,7 @@ use rstd::{vec::Vec, slice, vec};
 
 use runtime_io::{
 	set_storage, storage, clear_prefix, print, blake2_128, blake2_256,
-	twox_128, twox_256, ed25519_verify, sr25519_verify, enumerated_trie_root
+	twox_128, twox_256, ed25519_verify, sr25519_verify, ordered_trie_root
 };
 use primitives::{ed25519, sr25519};
 
@@ -93,8 +93,8 @@ impl_stubs!(
 		let msg = b"all ok!";
 		[sr25519_verify(&sr25519::Signature(sig), &msg[..], &sr25519::Public(pubkey)) as u8].to_vec()
 	},
-	test_enumerated_trie_root => |_| {
-		enumerated_trie_root::<primitives::Blake2Hasher>(
+	test_ordered_trie_root => |_| {
+		ordered_trie_root::<primitives::Blake2Hasher, _, _>(
 			&[
 				&b"zero"[..],
 				&b"one"[..],

substrate/core/executor/src/wasm_executor.rs

@@ -1660,12 +1660,12 @@ mod tests {
 	}
 
 	#[test]
-	fn enumerated_trie_root_should_work() {
+	fn ordered_trie_root_should_work() {
 		let mut ext = TestExternalities::<Blake2Hasher>::default();
 		let trie_input = vec![b"zero".to_vec(), b"one".to_vec(), b"two".to_vec()];
 		let test_code = WASM_BINARY;
 		assert_eq!(
-			WasmExecutor::new().call(&mut ext, 8, &test_code[..], "test_enumerated_trie_root", &[]).unwrap(),
+			WasmExecutor::new().call(&mut ext, 8, &test_code[..], "test_ordered_trie_root", &[]).unwrap(),
 			Layout::<Blake2Hasher>::ordered_trie_root(trie_input.iter()).as_fixed_bytes().encode()
 		);
 	}