Merge pull request #89 from nspcc-dev/untie-neogo

*: get rid of github.com/nspcc-dev/neo-go/pkg/io dependency

block/block.go

@@ -1,9 +1,11 @@
 package block
 
 import (
+	"bytes"
+	"encoding/gob"
+
 	"github.com/nspcc-dev/dbft/crypto"
 	"github.com/nspcc-dev/dbft/merkle"
-	"github.com/nspcc-dev/neo-go/pkg/io"
 	"github.com/nspcc-dev/neo-go/pkg/util"
 )
 
@@ -48,7 +50,7 @@ type (
 
 		// Transactions returns block's transaction list.
 		Transactions() []Transaction
-		// SetTransaction sets block's transaction list.
+		// SetTransactions sets block's transaction list.
 		SetTransactions([]Transaction)
 	}
 
@@ -135,10 +137,11 @@ func (b *neoBlock) Signature() []byte {
 // 1. It must have only one valid result for one block.
 // 2. Two different blocks must have different hash data.
 func (b *neoBlock) GetHashData() []byte {
-	w := io.NewBufBinWriter()
-	b.EncodeBinary(w.BinWriter)
+	buf := bytes.Buffer{}
+	w := gob.NewEncoder(&buf)
+	_ = b.EncodeBinary(w)
 
-	return w.Bytes()
+	return buf.Bytes()
 }
 
 // Sign implements Block interface.
@@ -175,24 +178,12 @@ func (b *neoBlock) Hash() (h util.Uint256) {
 	return hash
 }
 
-// EncodeBinary implements io.Serializable interface.
-func (b base) EncodeBinary(w *io.BinWriter) {
-	w.WriteU32LE(b.Version)
-	w.WriteBytes(b.PrevHash[:])
-	w.WriteBytes(b.MerkleRoot[:])
-	w.WriteU32LE(b.Timestamp)
-	w.WriteU32LE(b.Index)
-	w.WriteU64LE(b.ConsensusData)
-	w.WriteBytes(b.NextConsensus[:])
-}
-
-// DecodeBinary implements io.Serializable interface.
-func (b *base) DecodeBinary(r *io.BinReader) {
-	b.Version = r.ReadU32LE()
-	r.ReadBytes(b.PrevHash[:])
-	r.ReadBytes(b.MerkleRoot[:])
-	b.Timestamp = r.ReadU32LE()
-	b.Index = r.ReadU32LE()
-	b.ConsensusData = r.ReadU64LE()
-	r.ReadBytes(b.NextConsensus[:])
+// EncodeBinary implements Serializable interface.
+func (b base) EncodeBinary(w *gob.Encoder) error {
+	return w.Encode(b)
+}
+
+// DecodeBinary implements Serializable interface.
+func (b *base) DecodeBinary(r *gob.Decoder) error {
+	return r.Decode(b)
 }

block/block_test.go

@@ -1,13 +1,14 @@
 package block
 
 import (
+	"bytes"
 	"crypto/rand"
 	"encoding/binary"
+	"encoding/gob"
 	"errors"
 	"testing"
 
 	"github.com/nspcc-dev/dbft/crypto"
-	"github.com/nspcc-dev/neo-go/pkg/io"
 	"github.com/nspcc-dev/neo-go/pkg/util"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -45,14 +46,15 @@ func TestNeoBlock_Setters(t *testing.T) {
 	assert.EqualValues(t, 100, b.Index())
 
 	t.Run("marshal block", func(t *testing.T) {
-		w := io.NewBufBinWriter()
-		b.EncodeBinary(w.BinWriter)
-		require.NoError(t, w.Err)
+		buf := bytes.Buffer{}
+		w := gob.NewEncoder(&buf)
+		err := b.EncodeBinary(w)
+		require.NoError(t, err)
 
-		r := io.NewBinReaderFromBuf(w.Bytes())
+		r := gob.NewDecoder(bytes.NewReader(buf.Bytes()))
 		newb := new(neoBlock)
-		newb.DecodeBinary(r)
-		require.NoError(t, r.Err)
+		err = newb.DecodeBinary(r)
+		require.NoError(t, err)
 		require.Equal(t, b.base, newb.base)
 	})
 

config.go

@@ -99,14 +99,14 @@ func defaultConfig() *Config {
 		TimestampIncrement:  defaultTimestampIncrement,
 		GetKeyPair:          nil,
 		NewBlockFromContext: NewBlockFromContext,
-		RequestTx:           func(h ...util.Uint256) {},
+		RequestTx:           func(...util.Uint256) {},
 		StopTxFlow:          func() {},
-		GetTx:               func(h util.Uint256) block.Transaction { return nil },
+		GetTx:               func(util.Uint256) block.Transaction { return nil },
 		GetVerified:         func() []block.Transaction { return make([]block.Transaction, 0) },
-		VerifyBlock:         func(b block.Block) bool { return true },
-		Broadcast:           func(m payload.ConsensusPayload) {},
-		ProcessBlock:        func(b block.Block) {},
-		GetBlock:            func(h util.Uint256) block.Block { return nil },
+		VerifyBlock:         func(block.Block) bool { return true },
+		Broadcast:           func(payload.ConsensusPayload) {},
+		ProcessBlock:        func(block.Block) {},
+		GetBlock:            func(util.Uint256) block.Block { return nil },
 		WatchOnly:           func() bool { return false },
 		CurrentHeight:       nil,
 		CurrentBlockHash:    nil,

dbft_test.go

@@ -790,7 +790,7 @@ func (s *testState) getOptions() []Option {
 		WithProcessBlock(func(b block.Block) { s.blocks = append(s.blocks, b) }),
 		WithGetConsensusAddress(s.nextConsensus),
 		WithWatchOnly(func() bool { return false }),
-		WithGetBlock(func(h util.Uint256) block.Block { return nil }),
+		WithGetBlock(func(util.Uint256) block.Block { return nil }),
 		WithTimer(timer.New()),
 		WithLogger(zap.NewNop()),
 		WithNewBlockFromContext(NewBlockFromContext),
@@ -809,7 +809,7 @@ func (s *testState) getOptions() []Option {
 
 	verify := s.verify
 	if verify == nil {
-		verify = func(b block.Block) bool { return true }
+		verify = func(block.Block) bool { return true }
 	}
 
 	opts = append(opts, WithVerifyBlock(verify))

merkle/merkle_tree_test.go

@@ -6,7 +6,6 @@ import (
 	"testing"
 
 	"github.com/nspcc-dev/neo-go/pkg/util"
-
 	"github.com/stretchr/testify/require"
 )
 

payload/change_view.go

@@ -1,6 +1,8 @@
 package payload
 
-import "github.com/nspcc-dev/neo-go/pkg/io"
+import (
+	"encoding/gob"
+)
 
 // ChangeView represents dBFT ChangeView message.
 type ChangeView interface {
@@ -23,21 +25,34 @@ type ChangeView interface {
 	SetReason(reason ChangeViewReason)
 }
 
-type changeView struct {
-	newViewNumber byte
-	timestamp     uint32
-}
+type (
+	changeView struct {
+		newViewNumber byte
+		timestamp     uint32
+	}
+	// changeViewAux is an auxiliary structure for changeView encoding.
+	changeViewAux struct {
+		Timestamp uint32
+	}
+)
 
 var _ ChangeView = (*changeView)(nil)
 
-// EncodeBinary implements io.Serializable interface.
-func (c changeView) EncodeBinary(w *io.BinWriter) {
-	w.WriteU32LE(c.timestamp)
+// EncodeBinary implements Serializable interface.
+func (c changeView) EncodeBinary(w *gob.Encoder) error {
+	return w.Encode(&changeViewAux{
+		Timestamp: c.timestamp,
+	})
 }
 
-// DecodeBinary implements io.Serializable interface.
-func (c *changeView) DecodeBinary(r *io.BinReader) {
-	c.timestamp = r.ReadU32LE()
+// DecodeBinary implements Serializable interface.
+func (c *changeView) DecodeBinary(r *gob.Decoder) error {
+	aux := new(changeViewAux)
+	if err := r.Decode(aux); err != nil {
+		return err
+	}
+	c.timestamp = aux.Timestamp
+	return nil
 }
 
 // NewViewNumber implements ChangeView interface.

payload/commit.go

@@ -1,6 +1,8 @@
 package payload
 
-import "github.com/nspcc-dev/neo-go/pkg/io"
+import (
+	"encoding/gob"
+)
 
 // Commit is an interface for dBFT Commit message.
 type Commit interface {
@@ -12,22 +14,35 @@ type Commit interface {
 	SetSignature(signature []byte)
 }
 
-type commit struct {
-	signature [signatureSize]byte
-}
+type (
+	commit struct {
+		signature [signatureSize]byte
+	}
+	// commitAux is an auxiliary structure for commit encoding.
+	commitAux struct {
+		Signature [signatureSize]byte
+	}
+)
 
 const signatureSize = 64
 
 var _ Commit = (*commit)(nil)
 
-// EncodeBinary implements io.Serializable interface.
-func (c commit) EncodeBinary(w *io.BinWriter) {
-	w.WriteBytes(c.signature[:])
+// EncodeBinary implements Serializable interface.
+func (c commit) EncodeBinary(w *gob.Encoder) error {
+	return w.Encode(commitAux{
+		Signature: c.signature,
+	})
 }
 
-// DecodeBinary implements io.Serializable interface.
-func (c *commit) DecodeBinary(r *io.BinReader) {
-	r.ReadBytes(c.signature[:])
+// DecodeBinary implements Serializable interface.
+func (c *commit) DecodeBinary(r *gob.Decoder) error {
+	aux := new(commitAux)
+	if err := r.Decode(aux); err != nil {
+		return err
+	}
+	c.signature = aux.Signature
+	return nil
 }
 
 // Signature implements Commit interface.

payload/compact.go

@@ -1,59 +1,53 @@
 package payload
 
-import "github.com/nspcc-dev/neo-go/pkg/io"
+import (
+	"encoding/gob"
+)
 
 type (
 	changeViewCompact struct {
-		validatorIndex     uint16
-		originalViewNumber byte
-		timestamp          uint32
+		ValidatorIndex     uint16
+		OriginalViewNumber byte
+		Timestamp          uint32
 	}
 
 	commitCompact struct {
-		viewNumber     byte
-		validatorIndex uint16
-		signature      [signatureSize]byte
+		ViewNumber     byte
+		ValidatorIndex uint16
+		Signature      [signatureSize]byte
 	}
 
 	preparationCompact struct {
-		validatorIndex uint16
+		ValidatorIndex uint16
 	}
 )
 
-// EncodeBinary implements io.Serializable interface.
-func (p changeViewCompact) EncodeBinary(w *io.BinWriter) {
-	w.WriteU16LE(p.validatorIndex)
-	w.WriteB(p.originalViewNumber)
-	w.WriteU32LE(p.timestamp)
+// EncodeBinary implements Serializable interface.
+func (p changeViewCompact) EncodeBinary(w *gob.Encoder) error {
+	return w.Encode(p)
 }
 
-// DecodeBinary implements io.Serializable interface.
-func (p *changeViewCompact) DecodeBinary(r *io.BinReader) {
-	p.validatorIndex = r.ReadU16LE()
-	p.originalViewNumber = r.ReadB()
-	p.timestamp = r.ReadU32LE()
+// DecodeBinary implements Serializable interface.
+func (p *changeViewCompact) DecodeBinary(r *gob.Decoder) error {
+	return r.Decode(p)
 }
 
-// EncodeBinary implements io.Serializable interface.
-func (p commitCompact) EncodeBinary(w *io.BinWriter) {
-	w.WriteB(p.viewNumber)
-	w.WriteU16LE(p.validatorIndex)
-	w.WriteBytes(p.signature[:])
+// EncodeBinary implements Serializable interface.
+func (p commitCompact) EncodeBinary(w *gob.Encoder) error {
+	return w.Encode(p)
 }
 
-// DecodeBinary implements io.Serializable interface.
-func (p *commitCompact) DecodeBinary(r *io.BinReader) {
-	p.viewNumber = r.ReadB()
-	p.validatorIndex = r.ReadU16LE()
-	r.ReadBytes(p.signature[:])
+// DecodeBinary implements Serializable interface.
+func (p *commitCompact) DecodeBinary(r *gob.Decoder) error {
+	return r.Decode(p)
 }
 
-// EncodeBinary implements io.Serializable interface.
-func (p preparationCompact) EncodeBinary(w *io.BinWriter) {
-	w.WriteU16LE(p.validatorIndex)
+// EncodeBinary implements Serializable interface.
+func (p preparationCompact) EncodeBinary(w *gob.Encoder) error {
+	return w.Encode(p)
 }
 
-// DecodeBinary implements io.Serializable interface.
-func (p *preparationCompact) DecodeBinary(r *io.BinReader) {
-	p.validatorIndex = r.ReadU16LE()
+// DecodeBinary implements Serializable interface.
+func (p *preparationCompact) DecodeBinary(r *gob.Decoder) error {
+	return r.Decode(p)
 }