From 1677bfc95bf9108fc57cdb92105dc79c3fd3315a Mon Sep 17 00:00:00 2001 From: mmsqe Date: Wed, 26 Oct 2022 12:18:59 +0800 Subject: [PATCH] fix test --- client/{file => }/decoder.go | 2 +- versiondb/backend_test_utils.go | 83 ++++++++++++++++----------------- versiondb/tmdb/store_test.go | 4 +- 3 files changed, 44 insertions(+), 45 deletions(-) rename client/{file => }/decoder.go (96%) diff --git a/client/file/decoder.go b/client/decoder.go similarity index 96% rename from client/file/decoder.go rename to client/decoder.go index 150d1f0be4..330ee32d65 100644 --- a/client/file/decoder.go +++ b/client/decoder.go @@ -1,4 +1,4 @@ -package file +package client import ( "github.com/cosmos/cosmos-sdk/store/types" diff --git a/versiondb/backend_test_utils.go b/versiondb/backend_test_utils.go index dcbb55e8ce..7a4d3b9148 100644 --- a/versiondb/backend_test_utils.go +++ b/versiondb/backend_test_utils.go @@ -13,9 +13,8 @@ import ( var ( key1 = []byte("key1") key2 = []byte("key2") - value1 = []byte("value1") - value2 = []byte("value2") - value3 = []byte("value3") + value1 = []byte("1") + value2 = []byte("2") key1_subkey = []byte("key1/subkey") ) @@ -23,30 +22,30 @@ func MockStoreKVPairs(v int64) []types.StoreKVPair { switch v { case 0: return []types.StoreKVPair{ - {StoreKey: "evm", Key: []byte("delete-in-block2"), Value: []byte("1")}, - {StoreKey: "evm", Key: []byte("re-add-in-block3"), Value: []byte("1")}, - {StoreKey: "evm", Key: []byte("z-genesis-only"), Value: []byte("2")}, - {StoreKey: "evm", Key: []byte("modify-in-block2"), Value: []byte("1")}, - {StoreKey: "staking", Key: []byte("key1"), Value: []byte("value1")}, - {StoreKey: "staking", Key: []byte("key1/subkey"), Value: []byte("value1")}, + {StoreKey: "evm", Key: []byte("delete-in-block2"), Value: value1}, + {StoreKey: "evm", Key: []byte("re-add-in-block3"), Value: value1}, + {StoreKey: "evm", Key: []byte("z-genesis-only"), Value: value2}, + {StoreKey: "evm", Key: []byte("modify-in-block2"), Value: value1}, + {StoreKey: "staking", Key: key1, Value: value1}, + {StoreKey: "staking", Key: key1_subkey, Value: value1}, } case 1: return []types.StoreKVPair{ {StoreKey: "evm", Key: []byte("re-add-in-block3"), Delete: true}, - {StoreKey: "evm", Key: []byte("add-in-block1"), Value: []byte("1")}, - {StoreKey: "staking", Key: []byte("key1"), Delete: true}, + {StoreKey: "evm", Key: []byte("add-in-block1"), Value: value1}, + {StoreKey: "staking", Key: key1, Delete: true}, } case 2: return []types.StoreKVPair{ - {StoreKey: "evm", Key: []byte("add-in-block2"), Value: []byte("1")}, + {StoreKey: "evm", Key: []byte("add-in-block2"), Value: value1}, {StoreKey: "evm", Key: []byte("delete-in-block2"), Delete: true}, - {StoreKey: "evm", Key: []byte("modify-in-block2"), Value: []byte("2")}, - {StoreKey: "evm", Key: []byte("key2"), Delete: true}, - {StoreKey: "staking", Key: []byte("key1"), Value: []byte("value2")}, + {StoreKey: "evm", Key: []byte("modify-in-block2"), Value: value2}, + {StoreKey: "evm", Key: key2, Delete: true}, + {StoreKey: "staking", Key: key1, Value: value2}, } case 3: return []types.StoreKVPair{ - {StoreKey: "evm", Key: []byte("re-add-in-block3"), Value: []byte("2")}, + {StoreKey: "evm", Key: []byte("re-add-in-block3"), Value: value2}, } case 4: return []types.StoreKVPair{ @@ -82,7 +81,7 @@ func testBasics(t *testing.T, store VersionStore) { value, err := store.GetAtVersion("evm", []byte("z-genesis-only"), nil) require.NoError(t, err) - require.Equal(t, value, []byte("2")) + require.Equal(t, value, value2) v = 4 ok, err := store.HasAtVersion("evm", []byte("z-genesis-only"), &v) @@ -90,7 +89,7 @@ func testBasics(t *testing.T, store VersionStore) { require.True(t, ok) value, err = store.GetAtVersion("evm", []byte("z-genesis-only"), &v) require.NoError(t, err) - require.Equal(t, value, []byte("2")) + require.Equal(t, value, value2) value, err = store.GetAtVersion("evm", []byte("re-add-in-block3"), nil) require.NoError(t, err) @@ -102,12 +101,12 @@ func testBasics(t *testing.T, store VersionStore) { value, err = store.GetAtVersion("staking", key1, nil) require.NoError(t, err) - require.Equal(t, value, []byte("value2")) + require.Equal(t, value, value2) v = 2 value, err = store.GetAtVersion("staking", key1, &v) require.NoError(t, err) - require.Equal(t, value, []byte("value2")) + require.Equal(t, value, value2) ok, err = store.HasAtVersion("staking", key1, &v) require.NoError(t, err) @@ -116,7 +115,7 @@ func testBasics(t *testing.T, store VersionStore) { v = 0 value, err = store.GetAtVersion("staking", key1, &v) require.NoError(t, err) - require.Equal(t, value, []byte("value1")) + require.Equal(t, value, value1) v = 1 value, err = store.GetAtVersion("staking", key1, &v) @@ -146,35 +145,35 @@ func testIterator(t *testing.T, store VersionStore) { expItems := [][]KVPair{ { - KVPair{[]byte("delete-in-block2"), []byte("1")}, - KVPair{[]byte("modify-in-block2"), []byte("1")}, - KVPair{[]byte("re-add-in-block3"), []byte("1")}, - KVPair{[]byte("z-genesis-only"), []byte("2")}, + KVPair{[]byte("delete-in-block2"), value1}, + KVPair{[]byte("modify-in-block2"), value1}, + KVPair{[]byte("re-add-in-block3"), value1}, + KVPair{[]byte("z-genesis-only"), value2}, }, { - KVPair{[]byte("add-in-block1"), []byte("1")}, - KVPair{[]byte("delete-in-block2"), []byte("1")}, - KVPair{[]byte("modify-in-block2"), []byte("1")}, - KVPair{[]byte("z-genesis-only"), []byte("2")}, + KVPair{[]byte("add-in-block1"), value1}, + KVPair{[]byte("delete-in-block2"), value1}, + KVPair{[]byte("modify-in-block2"), value1}, + KVPair{[]byte("z-genesis-only"), value2}, }, { - KVPair{[]byte("add-in-block1"), []byte("1")}, - KVPair{[]byte("add-in-block2"), []byte("1")}, - KVPair{[]byte("modify-in-block2"), []byte("2")}, - KVPair{[]byte("z-genesis-only"), []byte("2")}, + KVPair{[]byte("add-in-block1"), value1}, + KVPair{[]byte("add-in-block2"), value1}, + KVPair{[]byte("modify-in-block2"), value2}, + KVPair{[]byte("z-genesis-only"), value2}, }, { - KVPair{[]byte("add-in-block1"), []byte("1")}, - KVPair{[]byte("add-in-block2"), []byte("1")}, - KVPair{[]byte("modify-in-block2"), []byte("2")}, - KVPair{[]byte("re-add-in-block3"), []byte("2")}, - KVPair{[]byte("z-genesis-only"), []byte("2")}, + KVPair{[]byte("add-in-block1"), value1}, + KVPair{[]byte("add-in-block2"), value1}, + KVPair{[]byte("modify-in-block2"), value2}, + KVPair{[]byte("re-add-in-block3"), value2}, + KVPair{[]byte("z-genesis-only"), value2}, }, { - KVPair{[]byte("add-in-block1"), []byte("1")}, - KVPair{[]byte("add-in-block2"), []byte("1")}, - KVPair{[]byte("modify-in-block2"), []byte("2")}, - KVPair{[]byte("z-genesis-only"), []byte("2")}, + KVPair{[]byte("add-in-block1"), value1}, + KVPair{[]byte("add-in-block2"), value1}, + KVPair{[]byte("modify-in-block2"), value2}, + KVPair{[]byte("z-genesis-only"), value2}, }, } for i, exp := range expItems { diff --git a/versiondb/tmdb/store_test.go b/versiondb/tmdb/store_test.go index 702cfe739e..1a4a350c29 100644 --- a/versiondb/tmdb/store_test.go +++ b/versiondb/tmdb/store_test.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/crypto-org-chain/cronos/client/file" + "github.com/crypto-org-chain/cronos/client" "github.com/crypto-org-chain/cronos/versiondb" "github.com/crypto-org-chain/cronos/x/cronos/types" "github.com/stretchr/testify/require" @@ -35,7 +35,7 @@ func TestFeed(t *testing.T) { _, err = buf.Write(bz) require.NoError(t, err) } - pairs, err := file.DecodeData(buf.Bytes()) + pairs, err := client.DecodeData(buf.Bytes()) require.NoError(t, err) require.NotEmpty(t, pairs) store := storeCreator()