From e46e6ce15f866abfe0e8b32a2fb671c377493aaf Mon Sep 17 00:00:00 2001 From: laizy Date: Wed, 2 Jan 2019 11:26:40 +0800 Subject: [PATCH] adjust p2p message to accept old version node's block --- core/store/ledgerstore/state_store.go | 3 +-- p2pserver/message/types/block.go | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/store/ledgerstore/state_store.go b/core/store/ledgerstore/state_store.go index 4e0d0615aa..98f807beb7 100644 --- a/core/store/ledgerstore/state_store.go +++ b/core/store/ledgerstore/state_store.go @@ -20,12 +20,11 @@ package ledgerstore import ( "bytes" + "encoding/binary" "errors" "fmt" "io" - "encoding/binary" - "github.com/ontio/ontology/common" "github.com/ontio/ontology/common/log" "github.com/ontio/ontology/common/serialization" diff --git a/p2pserver/message/types/block.go b/p2pserver/message/types/block.go index 769bf3536a..0322af1769 100644 --- a/p2pserver/message/types/block.go +++ b/p2pserver/message/types/block.go @@ -20,8 +20,6 @@ package types import ( "fmt" - "io" - "github.com/ontio/ontology/common" ct "github.com/ontio/ontology/core/types" "github.com/ontio/ontology/errors" @@ -58,7 +56,8 @@ func (this *Block) Deserialization(source *common.ZeroCopySource) error { eof := false this.MerkleRoot, eof = source.NextHash() if eof { - return io.ErrUnexpectedEOF + // to accept old node's block + this.MerkleRoot = common.UINT256_EMPTY } return nil }