adjust p2p message to accept old version node's block

ontio · Jan 10, 2019 · e46e6ce · e46e6ce
1 parent ca1b039
commit e46e6ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
 }