TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2024-12-24 09:25:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1640 from nspcc-dev/fix/mpt

Browse source 
Hotfixes for testnet
This commit is contained in:
Roman Khimov 2020-12-26 09:04:18 +03:00 committed by GitHub
commit 197b98f40b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,7 +63,7 @@ func (b *BaseNode) updateHash(n Node) {
// updateCache updates hash and bytes fields for this BaseNode. // updateCache updates hash and bytes fields for this BaseNode.
func (b *BaseNode) updateBytes(n Node) { func (b *BaseNode) updateBytes(n Node) {
buf := io.NewBufBinWriterPreAlloc(b.bytes) buf := io.NewBufBinWriter()
encodeNodeWithType(n, buf.BinWriter) encodeNodeWithType(n, buf.BinWriter)
b.bytes = buf.Bytes() b.bytes = buf.Bytes()
b.bytesValid = true b.bytesValid = true

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

@ -418,29 +418,31 @@ func (t *Trie) updateRefCount(h util.Uint256) int32 {
func (t *Trie) addRef(h util.Uint256, bs []byte) { func (t *Trie) addRef(h util.Uint256, bs []byte) {
node := t.refcount[h] node := t.refcount[h]
if node == nil { if node == nil {
data := make([]byte, len(bs))
copy(data, bs)
t.refcount[h] = &cachedNode{ t.refcount[h] = &cachedNode{
refcount: 1, refcount: 1,
bytes: data, bytes: bs,
} }
return return
} }
node.refcount++ node.refcount++
if node.bytes == nil {
node.bytes = bs
}
} }
func (t *Trie) removeRef(h util.Uint256, bs []byte) { func (t *Trie) removeRef(h util.Uint256, bs []byte) {
node := t.refcount[h] node := t.refcount[h]
if node == nil { if node == nil {
data := make([]byte, len(bs))
copy(data, bs)
t.refcount[h] = &cachedNode{ t.refcount[h] = &cachedNode{
refcount: -1, refcount: -1,
bytes: data, bytes: bs,
} }
return return
} }
node.refcount-- node.refcount--
if node.bytes == nil {
node.bytes = bs
}
} }
func (t *Trie) getFromStore(h util.Uint256) (Node, error) { func (t *Trie) getFromStore(h util.Uint256) (Node, error) {
@ -460,8 +462,7 @@ func (t *Trie) getFromStore(h util.Uint256) (Node, error) {
data = data[:len(data)-4] data = data[:len(data)-4]
node := t.refcount[h] node := t.refcount[h]
if node != nil { if node != nil {
node.bytes = make([]byte, len(data)) node.bytes = data
copy(node.bytes, data)
node.initial = int32(r.ReadU32LE()) node.initial = int32(r.ReadU32LE())
} }
} }

6
pkg/io/binaryBufWriter.go
View file

@ -19,12 +19,6 @@ func NewBufBinWriter() *BufBinWriter {
return &BufBinWriter{BinWriter: NewBinWriterFromIO(b), buf: b} return &BufBinWriter{BinWriter: NewBinWriterFromIO(b), buf: b}
} }
// NewBufBinWriterPreAlloc makes a BufBinWriter using preallocated buffer.
func NewBufBinWriterPreAlloc(buf []byte) *BufBinWriter {
b := bytes.NewBuffer(buf[:0])
return &BufBinWriter{BinWriter: NewBinWriterFromIO(b), buf: b}
}
// Len returns the number of bytes of the unread portion of the buffer. // Len returns the number of bytes of the unread portion of the buffer.
func (bw *BufBinWriter) Len() int { func (bw *BufBinWriter) Len() int {
return bw.buf.Len() return bw.buf.Len()