Downloading topic (#47)

- Introducing download topic
- Update tests

account/account_test.go

@@ -60,8 +60,17 @@ func TestMarshalingRawData(t *testing.T) {
 }
 
 func TestIncSequence(t *testing.T) {
-	acc, _ := GenerateTestAccount(0)
+	acc, _ := GenerateTestAccount(100)
 	seq := acc.Sequence()
 	acc.IncSequence()
 	assert.Equal(t, acc.Sequence(), seq+1)
+	assert.Equal(t, acc.Number(), 100)
+}
+
+func TestSubtractBalance(t *testing.T) {
+	acc, _ := GenerateTestAccount(100)
+	bal := acc.Balance()
+	acc.SubtractFromBalance(1)
+	assert.Equal(t, acc.Balance(), bal-1)
+
 }

block/commit.go

@@ -22,6 +22,9 @@ type commitData struct {
 }
 
 func NewCommit(blockHash crypto.Hash, round int, signed, missed []int, signature crypto.Signature) *Commit {
+	sort.Ints(signed)
+	sort.Ints(missed)
+
 	return &Commit{
 		data: commitData{
 			BlockHash: blockHash,

block/commit_test.go

@@ -71,3 +71,10 @@ func TestCommiters(t *testing.T) {
 	assert.Equal(t, c2.Committers(), expected1)
 	assert.Equal(t, c2.CommittersHash(), expected2)
 }
+
+func TestCommitHash(t *testing.T) {
+	temp := GenerateTestCommit(crypto.GenerateTestHash())
+	expected := temp.Hash()
+	c1 := NewCommit(temp.BlockHash(), temp.Round(), []int{3, 2, 1}, []int{0}, temp.Signature())
+	assert.Equal(t, c1.Hash(), expected)
+}

cmd/zarb/init.go

@@ -41,7 +41,11 @@ func Init() func(c *cli.Cmd) {
 			}
 
 			path, _ := filepath.Abs(*workingDirOpt)
-			gen := makeGenesis(*workingDirOpt, *chainNameOpt)
+			gen, err := makeGenesis(*workingDirOpt, *chainNameOpt)
+			if err != nil {
+				cmd.PrintErrorMsg("Failed to make genesis file: %v", err)
+				return
+			}
 			conf := makeConfigfile()
 
 			// save genesis file to file system
@@ -65,7 +69,7 @@ func Init() func(c *cli.Cmd) {
 }
 
 // makeGenesis makes genisis file while on initialize
-func makeGenesis(workingDir string, chainName string) *genesis.Genesis {
+func makeGenesis(workingDir string, chainName string) (*genesis.Genesis, error) {
 
 	// create  accounts for genesis
 	accs := make([]*account.Account, 5)
@@ -78,7 +82,7 @@ func makeGenesis(workingDir string, chainName string) *genesis.Genesis {
 	for i := 1; i < len(accs); i++ {
 		k := key.GenKey()
 		if err := key.EncryptKeyToFile(k, workingDir+"/keys/"+k.Address().String()+".json", "", ""); err != nil {
-			return nil
+			return nil, err
 		}
 		acc := account.NewAccount(k.Address(), i+1)
 		acc.AddToBalance(1000000)
@@ -89,14 +93,14 @@ func makeGenesis(workingDir string, chainName string) *genesis.Genesis {
 	// create validator account for genesis
 	k := key.GenKey()
 	if err := key.EncryptKeyToFile(k, workingDir+"/validator_key.json", "", ""); err != nil {
-		return nil
+		return nil, err
 	}
 	val := validator.NewValidator(k.PublicKey(), 0, 0)
 	vals := []*validator.Validator{val}
 
 	// create genesis
 	gen := genesis.MakeGenesis(chainName, util.RoundNow(60), accs, vals, 10)
-	return gen
+	return gen, nil
 
 }
 

consensus/commit.go

@@ -1,9 +1,8 @@
 package consensus
 
 import (
-	"github.com/zarbchain/zarb-go/block"
 	"github.com/zarbchain/zarb-go/consensus/hrs"
-	"github.com/zarbchain/zarb-go/message"
+	"github.com/zarbchain/zarb-go/sync/message"
 )
 
 func (cs *consensus) enterCommit(round int) {
@@ -67,6 +66,6 @@ func (cs *consensus) enterCommit(round int) {
 	cs.scheduleNewHeight()
 
 	// Now broadcast the committed block
-	msg := message.NewBlocksMessage(height, []*block.Block{&commitBlock}, commit)
+	msg := message.NewBlockAnnounceMessage(height, &commitBlock, commit)
 	cs.broadcastCh <- msg
 }

consensus/commit_test.go

@@ -5,42 +5,15 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/zarbchain/zarb-go/block"
 	"github.com/zarbchain/zarb-go/crypto"
 	"github.com/zarbchain/zarb-go/tx"
 	"github.com/zarbchain/zarb-go/vote"
 )
 
-func commitFirstBlock(t *testing.T) (b block.Block, votes [3]*vote.Vote) {
-	pb, err := tConsX.state.ProposeBlock(0)
-	require.NoError(t, err)
-	b = *pb
-
-	sb := block.CommitSignBytes(b.Hash(), 0)
-	sig1 := tSigners[0].Sign(sb)
-	sig2 := tSigners[1].Sign(sb)
-	sig3 := tSigners[2].Sign(sb)
-
-	sig := crypto.Aggregate([]*crypto.Signature{sig1, sig2, sig3})
-	c := block.NewCommit(b.Hash(), 0, []int{0, 1, 2}, []int{3}, sig)
-
-	require.NotNil(t, c)
-	err = tConsX.state.ApplyBlock(1, b, *c)
-	assert.NoError(t, err)
-	err = tConsY.state.ApplyBlock(1, b, *c)
-	assert.NoError(t, err)
-	err = tConsB.state.ApplyBlock(1, b, *c)
-	assert.NoError(t, err)
-	err = tConsP.state.ApplyBlock(1, b, *c)
-	assert.NoError(t, err)
-
-	return
-}
-
 func TestInvalidStepAfterBlockCommit(t *testing.T) {
 	setup(t)
 
-	commitFirstBlock(t)
+	commitBlockForAllStates(t)
 
 	tConsY.enterNewHeight()
 
@@ -55,7 +28,7 @@ func TestInvalidStepAfterBlockCommit(t *testing.T) {
 func TestEnterCommit(t *testing.T) {
 	setup(t)
 
-	commitFirstBlock(t)
+	commitBlockForAllStates(t)
 
 	tConsY.enterNewHeight()
 	tConsY.enterNewRound(1)
@@ -109,5 +82,5 @@ func TestEnterCommit(t *testing.T) {
 
 	// Everything is good
 	tConsY.enterCommit(1)
-	shouldPublishProposalBlock(t, tConsY)
+	shouldPublishBlockAnnounce(t, tConsY)
 }

consensus/consensus.go

@@ -8,8 +8,8 @@ import (
 	"github.com/zarbchain/zarb-go/consensus/hrs"
 	"github.com/zarbchain/zarb-go/crypto"
 	"github.com/zarbchain/zarb-go/logger"
-	"github.com/zarbchain/zarb-go/message"
 	"github.com/zarbchain/zarb-go/state"
+	"github.com/zarbchain/zarb-go/sync/message"
 	"github.com/zarbchain/zarb-go/util"
 	"github.com/zarbchain/zarb-go/validator"
 	"github.com/zarbchain/zarb-go/vote"
@@ -283,6 +283,6 @@ func (cs *consensus) signAddVote(msgType vote.VoteType, hash crypto.Hash) {
 }
 
 func (cs *consensus) requestForProposal() {
-	msg := message.NewProposalReqMessage(cs.hrs.Height(), cs.hrs.Round())
+	msg := message.NewQueryProposalMessage(cs.hrs.Height(), cs.hrs.Round())
 	cs.broadcastCh <- msg
 }

consensus/consensus_test.go

@@ -13,9 +13,9 @@ import (
 	"github.com/zarbchain/zarb-go/crypto"
 	"github.com/zarbchain/zarb-go/genesis"
 	"github.com/zarbchain/zarb-go/logger"
-	"github.com/zarbchain/zarb-go/message"
-	"github.com/zarbchain/zarb-go/message/payload"
 	"github.com/zarbchain/zarb-go/state"
+	"github.com/zarbchain/zarb-go/sync/message"
+	"github.com/zarbchain/zarb-go/sync/message/payload"
 	"github.com/zarbchain/zarb-go/txpool"
 	"github.com/zarbchain/zarb-go/util"
 	"github.com/zarbchain/zarb-go/validator"
@@ -40,12 +40,18 @@ const (
 )
 
 func setup(t *testing.T) {
+	if tConsX != nil {
+		tConsX.state.Close()
+		tConsY.state.Close()
+		tConsB.state.Close()
+		tConsP.state.Close()
+	}
 	conf := logger.TestConfig()
 	conf.Levels["_state"] = "debug"
 	logger.InitLogger(conf)
 
 	_, keys := validator.GenerateTestValidatorSet()
-	tTxPool = txpool.NewMockTxPool()
+	tTxPool = txpool.MockingTxPool()
 
 	tSigners = make([]crypto.Signer, 4)
 	for i, k := range keys {
@@ -62,10 +68,14 @@ func setup(t *testing.T) {
 	acc.AddToBalance(21000000000000)
 
 	tGenDoc = genesis.MakeGenesis("test", util.Now(), []*account.Account{acc}, vals, 1)
-	stX, _ := state.LoadOrNewState(state.TestConfig(), tGenDoc, tSigners[tIndexX], tTxPool)
-	stY, _ := state.LoadOrNewState(state.TestConfig(), tGenDoc, tSigners[tIndexY], tTxPool)
-	stB, _ := state.LoadOrNewState(state.TestConfig(), tGenDoc, tSigners[tIndexB], tTxPool)
-	stP, _ := state.LoadOrNewState(state.TestConfig(), tGenDoc, tSigners[tIndexP], tTxPool)
+	stX, err := state.LoadOrNewState(state.TestConfig(), tGenDoc, tSigners[tIndexX], tTxPool)
+	require.NoError(t, err)
+	stY, err := state.LoadOrNewState(state.TestConfig(), tGenDoc, tSigners[tIndexY], tTxPool)
+	require.NoError(t, err)
+	stB, err := state.LoadOrNewState(state.TestConfig(), tGenDoc, tSigners[tIndexB], tTxPool)
+	require.NoError(t, err)
+	stP, err := state.LoadOrNewState(state.TestConfig(), tGenDoc, tSigners[tIndexP], tTxPool)
+	require.NoError(t, err)
 
 	consX, err := NewConsensus(TestConfig(), stX, tSigners[tIndexX], make(chan *message.Message, 100))
 	assert.NoError(t, err)
@@ -79,9 +89,11 @@ func setup(t *testing.T) {
 	tConsY = consY.(*consensus)
 	tConsB = consB.(*consensus)
 	tConsP = consP.(*consensus)
+
+	//TODO: Give a name to the loggers. Look at sync tests
 }
 
-func shouldPublishProposalBlock(t *testing.T, cons *consensus) {
+func shouldPublishBlockAnnounce(t *testing.T, cons *consensus) {
 	timeout := time.NewTimer(1 * time.Second)
 
 	for {
@@ -90,9 +102,9 @@ func shouldPublishProposalBlock(t *testing.T, cons *consensus) {
 			require.NoError(t, fmt.Errorf("Timeout"))
 			return
 		case msg := <-cons.broadcastCh:
-			logger.Info("shouldPublishProposalBlock", "msg", msg)
+			logger.Info("shouldPublishBlockAnnounce", "msg", msg)
 
-			if msg.PayloadType() == payload.PayloadTypeBlocks {
+			if msg.PayloadType() == payload.PayloadTypeBlockAnnounce {
 				return
 			}
 		}
@@ -109,7 +121,7 @@ func shouldPublishProposalReqquest(t *testing.T, cons *consensus) {
 		case msg := <-cons.broadcastCh:
 			logger.Info("shouldPublishProposalReqquest", "msg", msg)
 
-			if msg.PayloadType() == payload.PayloadTypeProposalReq {
+			if msg.PayloadType() == payload.PayloadTypeQueryProposal {
 				return
 			}
 		}
@@ -171,6 +183,45 @@ func testAddVote(t *testing.T,
 	return v
 }
 
+func commitBlockForAllStates(t *testing.T) {
+	height := tConsX.state.LastBlockHeight()
+	var err error
+	var pb *block.Block
+	switch height % 4 {
+	case 0:
+		pb, err = tConsX.state.ProposeBlock(0)
+		require.NoError(t, err)
+	case 1:
+		pb, err = tConsY.state.ProposeBlock(0)
+		require.NoError(t, err)
+	case 2:
+		pb, err = tConsB.state.ProposeBlock(0)
+		require.NoError(t, err)
+	case 3:
+		pb, err = tConsP.state.ProposeBlock(0)
+		require.NoError(t, err)
+	}
+
+	sb := block.CommitSignBytes(pb.Hash(), 0)
+	sig1 := tSigners[0].Sign(sb)
+	sig2 := tSigners[1].Sign(sb)
+	sig3 := tSigners[2].Sign(sb)
+	sig4 := tSigners[3].Sign(sb)
+
+	sig := crypto.Aggregate([]*crypto.Signature{sig1, sig2, sig3, sig4})
+	c := block.NewCommit(pb.Hash(), 0, []int{0, 1, 2, 3}, []int{}, sig)
+
+	require.NotNil(t, c)
+	err = tConsX.state.ApplyBlock(height+1, *pb, *c)
+	assert.NoError(t, err)
+	err = tConsY.state.ApplyBlock(height+1, *pb, *c)
+	assert.NoError(t, err)
+	err = tConsB.state.ApplyBlock(height+1, *pb, *c)
+	assert.NoError(t, err)
+	err = tConsP.state.ApplyBlock(height+1, *pb, *c)
+	assert.NoError(t, err)
+}
+
 func TestNotInValidatorSet(t *testing.T) {
 	setup(t)
 

consensus/height.go

@@ -31,7 +31,6 @@ func (cs *consensus) enterNewHeight() {
 		if vs == nil {
 			cs.logger.Warn("NewHeight: Entering new height without last commit")
 		} else {
-			// TODO: add test for me
 			// Update last commit here, consensus had enough time to populate more votes
 			lastCommit := vs.ToCommit()
 			if lastCommit != nil {

consensus/height_test.go

@@ -14,7 +14,7 @@ func TestMoveToNewHeight(t *testing.T) {
 
 	tConsP.MoveToNewHeight()
 
-	commitFirstBlock(t)
+	commitBlockForAllStates(t)
 
 	tConsP.MoveToNewHeight()
 	checkHRSWait(t, tConsP, 2, 0, hrs.StepTypePropose)
@@ -37,8 +37,7 @@ func TestConsensusBehindState3(t *testing.T) {
 
 	// --------------------------------
 	// Syncer commit a block and trig consensus
-	commitFirstBlock(t)
-	tConsX.MoveToNewHeight()
+	commitBlockForAllStates(t)
 
 	assert.Equal(t, len(tConsX.RoundVotes(0)), 1)
 	assert.Equal(t, tConsX.hrs, hrs.NewHRS(1, 0, hrs.StepTypePrepare))
@@ -52,7 +51,6 @@ func TestConsensusBehindState3(t *testing.T) {
 	checkHRS(t, tConsX, 1, 0, hrs.StepTypePrepare)
 
 	testAddVote(t, tConsX, vote.VoteTypePrecommit, 1, 0, p.Block().Hash(), tIndexP, false)
-	checkHRS(t, tConsX, 1, 0, hrs.StepTypeCommit)
 
 	precommits := tConsX.pendingVotes.PrecommitVoteSet(0)
 	require.NotNil(t, precommits)
@@ -62,4 +60,6 @@ func TestConsensusBehindState3(t *testing.T) {
 
 	assert.NoError(t, tConsX.state.ApplyBlock(1, p.Block(), *precommits.ToCommit()))
 	// We don't get any error here, but the block is not committed again. Check logs.
+
+	tConsX.enterNewHeight()
 }

consensus/interface.go

@@ -6,14 +6,19 @@ import (
 	"github.com/zarbchain/zarb-go/vote"
 )
 
-type Consensus interface {
-	MoveToNewHeight()
-	Stop()
-	AddVote(v *vote.Vote)
+type ConsensusReader interface {
 	RoundVotes(round int) []*vote.Vote
 	RoundVotesHash(round int) []crypto.Hash
-	SetProposal(proposal *vote.Proposal)
 	LastProposal() *vote.Proposal
 	HRS() hrs.HRS
 	Fingerprint() string
 }
+
+type Consensus interface {
+	ConsensusReader
+
+	MoveToNewHeight()
+	Stop()
+	AddVote(v *vote.Vote)
+	SetProposal(proposal *vote.Proposal)
+}

consensus/mock.go

@@ -15,7 +15,7 @@ type MockConsensus struct {
 	Started  bool
 }
 
-func NewMockConsensus() *MockConsensus {
+func MockingConsensus() *MockConsensus {
 	return &MockConsensus{}
 }