TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2024-11-26 19:42:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

mpt: simplify makeStorageKey() interface

Browse source
This commit is contained in:
Roman Khimov 2022-01-27 14:25:11 +03:00
parent 9719191770
commit cd5810d6cf
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/core/mpt/batch_test.go
View file

@ -274,7 +274,7 @@ func TestTrie_PutBatchHash(t *testing.T) {
} }
tr1.Collapse(1) tr1.Collapse(1)
tr2.Collapse(1) tr2.Collapse(1)
key := makeStorageKey(tr1.root.(*BranchNode).Children[2].Hash().BytesBE()) key := makeStorageKey(tr1.root.(*BranchNode).Children[2].Hash())
require.NoError(t, tr1.Store.Delete(key)) require.NoError(t, tr1.Store.Delete(key))
require.NoError(t, tr2.Store.Delete(key)) require.NoError(t, tr2.Store.Delete(key))
testIncompletePut(t, ps, 1, tr1, tr2) testIncompletePut(t, ps, 1, tr1, tr2)

4
pkg/core/mpt/billet.go
View file

@ -177,7 +177,7 @@ func (b *Billet) putIntoHash(curr *HashNode, path []byte, val Node) (Node, error
} }
func (b *Billet) incrementRefAndStore(h util.Uint256, bs []byte) { func (b *Billet) incrementRefAndStore(h util.Uint256, bs []byte) {
key := makeStorageKey(h.BytesBE()) key := makeStorageKey(h)
if b.refcountEnabled { if b.refcountEnabled {
var ( var (
err error err error
@ -325,7 +325,7 @@ func (b *Billet) tryCollapseBranch(curr *BranchNode) Node {
// GetFromStore returns MPT node from the storage. // GetFromStore returns MPT node from the storage.
func (b *Billet) GetFromStore(h util.Uint256) (Node, error) { func (b *Billet) GetFromStore(h util.Uint256) (Node, error) {
data, err := b.Store.Get(makeStorageKey(h.BytesBE())) data, err := b.Store.Get(makeStorageKey(h))
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
pkg/core/mpt/billet_test.go
View file

@ -16,7 +16,7 @@ func TestBillet_RestoreHashNode(t *testing.T) {
_ = expectedRoot.Hash() _ = expectedRoot.Hash()
_ = tr.root.Hash() _ = tr.root.Hash()
require.Equal(t, expectedRoot, tr.root) require.Equal(t, expectedRoot, tr.root)
expectedBytes, err := tr.Store.Get(makeStorageKey(expectedNode.Hash().BytesBE())) expectedBytes, err := tr.Store.Get(makeStorageKey(expectedNode.Hash()))
if expectedRefCount != 0 { if expectedRefCount != 0 {
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, expectedRefCount, binary.LittleEndian.Uint32(expectedBytes[len(expectedBytes)-4:])) require.Equal(t, expectedRefCount, binary.LittleEndian.Uint32(expectedBytes[len(expectedBytes)-4:]))

2
pkg/core/mpt/proof.go
View file

@ -70,7 +70,7 @@ func VerifyProof(rh util.Uint256, key []byte, proofs [][]byte) ([]byte, bool) {
for i := range proofs { for i := range proofs {
h := hash.DoubleSha256(proofs[i]) h := hash.DoubleSha256(proofs[i])
// no errors in Put to memory store // no errors in Put to memory store
_ = tr.Store.Put(makeStorageKey(h[:]), proofs[i]) _ = tr.Store.Put(makeStorageKey(h), proofs[i])
} }
_, leaf, _, err := tr.getWithPath(tr.root, path, true) _, leaf, _, err := tr.getWithPath(tr.root, path, true)
if err != nil { if err != nil {

10
pkg/core/mpt/trie.go
View file

@ -372,8 +372,8 @@ func (t *Trie) StateRoot() util.Uint256 {
return t.root.Hash() return t.root.Hash()
} }
func makeStorageKey(mptKey []byte) []byte { func makeStorageKey(mptKey util.Uint256) []byte {
return append([]byte{byte(storage.DataMPT)}, mptKey...) return append([]byte{byte(storage.DataMPT)}, mptKey[:]...)
} }
// Flush puts every node in the trie except Hash ones to the storage. // Flush puts every node in the trie except Hash ones to the storage.
@ -392,7 +392,7 @@ func (t *Trie) Flush() {
delete(t.refcount, h) delete(t.refcount, h)
} }
} else if node.refcount > 0 { } else if node.refcount > 0 {
_ = t.Store.Put(makeStorageKey(h.BytesBE()), node.bytes) _ = t.Store.Put(makeStorageKey(h), node.bytes)
} }
node.refcount = 0 node.refcount = 0
} else { } else {
@ -407,7 +407,7 @@ func (t *Trie) updateRefCount(h util.Uint256) int32 {
panic("`updateRefCount` is called, but GC is disabled") panic("`updateRefCount` is called, but GC is disabled")
} }
var data []byte var data []byte
key := makeStorageKey(h.BytesBE()) key := makeStorageKey(h)
node := t.refcount[h] node := t.refcount[h]
cnt := node.initial cnt := node.initial
if cnt == 0 { if cnt == 0 {
@ -466,7 +466,7 @@ func (t *Trie) removeRef(h util.Uint256, bs []byte) {
} }
func (t *Trie) getFromStore(h util.Uint256) (Node, error) { func (t *Trie) getFromStore(h util.Uint256) (Node, error) {
data, err := t.Store.Get(makeStorageKey(h.BytesBE())) data, err := t.Store.Get(makeStorageKey(h))
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
pkg/core/mpt/trie_test.go
View file

@ -251,7 +251,7 @@ func (tr *Trie) putToStore(n Node) {
} }
tr.updateRefCount(n.Hash()) tr.updateRefCount(n.Hash())
} else { } else {
_ = tr.Store.Put(makeStorageKey(n.Hash().BytesBE()), n.Bytes()) _ = tr.Store.Put(makeStorageKey(n.Hash()), n.Bytes())
} }
} }