Test enumerted trie root.

substrate/executor/src/wasm_executor.rs

@@ -382,16 +382,16 @@ mod tests {
 		);
 	}
 
-/*	#[test]
+	#[test]
 	fn enumerated_trie_root_should_work() {
 		let mut ext = TestExternalities::default();
 		let test_code = include_bytes!("../../wasm-runtime/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm");
 		assert_eq!(
 			WasmExecutor.call(&mut ext, &test_code[..], "test_enumerated_trie_root", &CallData(vec![])).unwrap(),
-			vec![0]
+			ordered_trie_root(vec![b"zero".to_vec(), b"one".to_vec(), b"two".to_vec()]).0.to_vec()
 		);
 	}
-*/
+
 	fn tx() -> Vec<u8> { "679fcf0a846b4224c84ecad7d91a26241c46d00cb53d6480a363274e8965ee34b0b80b4b2e3836d3d8f8f12c0c1aef7350af587d9aee3883561d11726068ac0a2f8c6129d816cf51c374bc7f08c3e63ed156cf78aefb4a6550d97b87997977ee00000000000000000228000000d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a4500000000000000".convert() }
 
 	#[test]

substrate/wasm-runtime/test/src/lib.rs

@@ -8,7 +8,8 @@ use alloc::vec::Vec;
 
 #[macro_use]
 extern crate runtime_std;
-use runtime_std::{set_storage, storage, print, blake2_256, twox_128, twox_256, ed25519_verify};
+use runtime_std::{set_storage, storage, print, blake2_256, twox_128, twox_256, ed25519_verify,
+	enumerated_trie_root};
 
 fn test_blake2_256(input: &[u8]) -> Vec<u8> {
 	blake2_256(&input).to_vec()
@@ -29,6 +30,10 @@ fn test_ed25519_verify(input: &[u8]) -> Vec<u8> {
 	[ed25519_verify(sig, &msg[..], pubkey) as u8].to_vec()
 }
 
+fn test_enumerated_trie_root(_input: &[u8]) -> Vec<u8> {
+	enumerated_trie_root(&[&b"zero"[..], &b"one"[..], &b"two"[..]]).to_vec()
+}
+
 fn test_data_in(input: &[u8]) -> Vec<u8> {
 	print("set_storage");
 	set_storage(b"input", &input);
@@ -59,4 +64,4 @@ fn test_conditional_panic(input: &[u8]) -> Vec<u8> {
 }
 
 impl_stubs!(test_data_in, test_empty_return, test_panic, test_conditional_panic,
-	test_blake2_256, test_twox_256, test_twox_128, test_ed25519_verify);
+	test_blake2_256, test_twox_256, test_twox_128, test_ed25519_verify, test_enumerated_trie_root);