From e1006c3ac381514f349ce9fb0920a35687bc6912 Mon Sep 17 00:00:00 2001 From: Tim Wu Date: Tue, 31 May 2022 14:32:45 -0400 Subject: [PATCH] revise expected from hardcoded string to actual test trie --- dot/rpc/modules/childstate_test.go | 49 +++++------------------------- 1 file changed, 8 insertions(+), 41 deletions(-) diff --git a/dot/rpc/modules/childstate_test.go b/dot/rpc/modules/childstate_test.go index d16ae9f2937..681fb48b7aa 100644 --- a/dot/rpc/modules/childstate_test.go +++ b/dot/rpc/modules/childstate_test.go @@ -43,47 +43,14 @@ func createTestTrieState(t *testing.T) (*trie.Trie, common.Hash) { } func TestChildStateModule_GetKeys(t *testing.T) { - //nolint - expStr := []string{ - "0x11f3ba2e1cdd6d62f2ff9b5589e7ff81ba7fb8745735dc3be2a2c61a72c39e78", - "0x1cb6f36e027abb2091cfb5110ab5087f5e0621c4869aa60c02be9adcc98a0d1d", - "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da904f6d6860c6ef3990f6d34dd83a345aabe1d9d59de1283380100550a7b024501cb62d6cc40e3db35fcc5cf341814986e", - "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da923a05cabf6d3bde7ca3ef0d11596b5611cbd2d43530a44705ad088af313e18f80b53ef16b36177cd4b77b846f2a5f07c", - "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da94f9aea1afa791265fae359272badc1cf8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48", - "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da97a26f8a0cd62e2d6addec8cbfdd102af1206960f920a23f7f4c43cc9081ec2ed0721f31a9bef2c10fd7602e16e08a32c", - "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da981b4d873b42c98d6628cf8d2b2373afe4603307f855321776922daeea21ee31720388d097cdaac66f05a6f8462b31757", - "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9b0edae20838083f2cde1c4080db8cf8090b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe22", - "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9de1e86a9a8c739864cf3cc5ec2bea59fd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d", - "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9e5e802737cce3a54b0bc9e3d3e6be26e306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20", - "0x26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9edeaa42c2163f68084a988529a0e2ec5e659a7a1628cdd93febc04a4e0646ea20e9f5f0ce097d9a05290d4a9e054df4e", - "0x26aa394eea5630e07c48ae0c9558cef7c21aab032aaa6e946ca50ad39ab66603", - "0x3a6368696c645f73746f726167653a64656661756c743a3a6368696c645f73746f726167655f6b6579", - "0x3a636f6465", - "0x3a66697273745f6b6579", - "0x3a6772616e6470615f617574686f726974696573", - "0x3a7365636f6e645f6b6579", - "0x426e15054d267946093858132eb537f1a47a9ff5cd5bf4d848a80a0b1a947dc3", - "0x426e15054d267946093858132eb537f1ba7fb8745735dc3be2a2c61a72c39e78", - "0x426e15054d267946093858132eb537f1d0b4a3f7631f0c0e761898fe198211de", - "0x4342193e496fab7ec59d615ed0dc5530d2d505c0e6f76fd7ce0796ebe187401c", - "0x492a52699edf49c972c21db794cfcf57ba7fb8745735dc3be2a2c61a72c39e78", - "0x5f3e4907f716ac89b6347d15ececedca138e71612491192d68deab7e6f563fe1", - "0x5f3e4907f716ac89b6347d15ececedca28dccb559b95c40168a1b2696581b5a7", - "0x5f3e4907f716ac89b6347d15ececedca5579297f4dfb9609e7e4c2ebab9ce40a", - "0x5f3e4907f716ac89b6347d15ececedcaac0a2cbf8e355f5ea6cb2de8727bfb0c", - "0x5f3e4907f716ac89b6347d15ececedcab49a2738eeb30896aacb8b3fb46471bd", - "0x5f3e4907f716ac89b6347d15ececedcac29a0310e1bb45d20cace77ccb62c97d", - "0x5f3e4907f716ac89b6347d15ececedcaf7dad0317324aecae8744b87fc95f2f3", - "0x8985776095addd4789fccbce8ca77b23ba7fb8745735dc3be2a2c61a72c39e78", - "0xcec5070d609dd3497f72bde07fc96ba04c014e6bf8b8c2c011e7290b85696bb3e535263148daaf49be5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f", - "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa195066b8d48da86b869b6261626580d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d", - "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa1950c9b0c13125732d276175646980d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d", - "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa1950ed43a85541921049696d6f6e80d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d", - "0xcec5070d609dd3497f72bde07fc96ba0726380404683fc89e8233450c8aa1950f5537bdb2a1f626b6772616e8088dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee", - "0xe2e62dd81c48a88f73b6f6463555fd8eba7fb8745735dc3be2a2c61a72c39e78"} - tr, sr := createTestTrieState(t) + expKeys := tr.GetKeysWithPrefix([]byte{}) + expHexKeys := make([]string, len(expKeys)) + for idx, k := range expKeys { + expHexKeys[idx] = common.BytesToHex(k) + } + mockStorageAPI := new(apimocks.StorageAPI) mockErrorStorageAPI1 := new(apimocks.StorageAPI) mockErrorStorageAPI2 := new(apimocks.StorageAPI) @@ -129,7 +96,7 @@ func TestChildStateModule_GetKeys(t *testing.T) { Key: []byte(":child_storage_key"), }, }, - exp: expStr, + exp: expHexKeys, }, { name: "Get Keys with Hash", @@ -143,7 +110,7 @@ func TestChildStateModule_GetKeys(t *testing.T) { Hash: &hash, }, }, - exp: expStr, + exp: expHexKeys, }, { name: "GetStorageChild error",