testing, and hash block and sign it when creating

node/node.go

@@ -33,6 +33,7 @@ func (node *Node) Sign(m []byte) (*core.Signature, error) {
 }
 
 func (node *Node) SignBlock(block *core.Block) error {
+	block.CalculateHash()
 	sig, err := core.Sign(node.PrivK, block.Hash[:])
 	if err != nil {
 		return err
@@ -46,9 +47,12 @@ func (node *Node) AddToPendingTxs(tx core.Tx) {
 }
 
 func (node *Node) BlockFromPendingTxs() (*core.Block, error) {
-	block := node.NewBlock(node.PendingTxs)
+	block, err := node.NewBlock(node.PendingTxs)
+	if err != nil {
+		return nil, err
+	}
 	block.PrevHash = node.Bc.LastBlock.Hash
-	err := block.CalculatePoW(node.Bc.Difficulty)
+	err = block.CalculatePoW(node.Bc.Difficulty)
 	if err != nil {
 		return nil, err
 	}
@@ -61,7 +65,7 @@ func (node *Node) BlockFromPendingTxs() (*core.Block, error) {
 	return block, nil
 }
 
-func (node *Node) NewBlock(txs []core.Tx) *core.Block {
+func (node *Node) NewBlock(txs []core.Tx) (*core.Block, error) {
 	block := &core.Block{
 		Height:    node.Bc.GetHeight() + 1,
 		PrevHash:  node.Bc.LastBlock.Hash,
@@ -73,12 +77,17 @@ func (node *Node) NewBlock(txs []core.Tx) *core.Block {
 		Hash:      core.Hash{},
 		Signature: []byte{},
 	}
-	return block
+	block.CalculateHash()
+	err := node.SignBlock(block)
+	if err != nil {
+		return nil, err
+	}
+	return block, nil
 }
 
 func (node *Node) CreateGenesis() (*core.Block, error) {
 	block := &core.Block{
-		Height:    node.Bc.LastBlock.Height,
+		Height:    node.Bc.LastBlock.Height + 1,
 		PrevHash:  node.Bc.LastBlock.Hash,
 		Txs:       []core.Tx{},
 		Miner:     node.Addr,
@@ -89,10 +98,10 @@ func (node *Node) CreateGenesis() (*core.Block, error) {
 		Signature: []byte{},
 	}
 
+	block.CalculateHash()
 	err := node.SignBlock(block)
 	if err != nil {
 		return nil, err
 	}
-	block.CalculateHash()
 	return block, nil
 }

node/node_test.go

@@ -1,7 +1,7 @@
 package node
 
 import (
-	"fmt"
+	"crypto/ecdsa"
 	"io/ioutil"
 	"testing"
 
@@ -10,6 +10,27 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func newTestPoABlockchain() (*ecdsa.PrivateKey, *core.Blockchain, error) {
+	dir, err := ioutil.TempDir("", "db")
+	if err != nil {
+		return nil, nil, err
+	}
+	db, err := db.New(dir)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	privK, err := core.NewKey()
+	if err != nil {
+		return nil, nil, err
+	}
+
+	var authNodes []*ecdsa.PublicKey
+	authNodes = append(authNodes, &privK.PublicKey)
+
+	bc := core.NewPoABlockchain(db, authNodes)
+	return privK, bc, nil
+}
 func TestNode(t *testing.T) {
 	dir, err := ioutil.TempDir("", "db")
 	assert.Nil(t, err)
@@ -49,16 +70,9 @@ func TestNodeSignature(t *testing.T) {
 }
 
 func TestBlockFromPendingTxs(t *testing.T) {
-	dir, err := ioutil.TempDir("", "db")
-	assert.Nil(t, err)
-	db, err := db.New(dir)
+	privK, bc, err := newTestPoABlockchain()
 	assert.Nil(t, err)
 
-	privK, err := core.NewKey()
-	assert.Nil(t, err)
-
-	dif := uint64(1)
-	bc := core.NewBlockchain(db, dif)
 	node, err := NewNode(privK, bc, true)
 	assert.Nil(t, err)
 
@@ -72,22 +86,14 @@ func TestBlockFromPendingTxs(t *testing.T) {
 	node.AddToPendingTxs(*tx)
 	block, err := node.BlockFromPendingTxs()
 	assert.Nil(t, err)
-	fmt.Println("h", block.Hash)
 	assert.True(t, core.CheckBlockPoW(block, node.Bc.Difficulty))
 	assert.True(t, node.Bc.VerifyBlock(block))
 }
 
 func TestBlockFromPendingTxsIteration(t *testing.T) {
-	dir, err := ioutil.TempDir("", "db")
-	assert.Nil(t, err)
-	db, err := db.New(dir)
+	privK, bc, err := newTestPoABlockchain()
 	assert.Nil(t, err)
 
-	privK, err := core.NewKey()
-	assert.Nil(t, err)
-
-	dif := uint64(1)
-	bc := core.NewBlockchain(db, dif)
 	node, err := NewNode(privK, bc, true)
 	assert.Nil(t, err)
 
@@ -109,16 +115,9 @@ func TestBlockFromPendingTxsIteration(t *testing.T) {
 }
 
 func TestFromGenesisToTenBlocks(t *testing.T) {
-	dir, err := ioutil.TempDir("", "db")
-	assert.Nil(t, err)
-	db, err := db.New(dir)
+	privK, bc, err := newTestPoABlockchain()
 	assert.Nil(t, err)
 
-	privK, err := core.NewKey()
-	assert.Nil(t, err)
-
-	dif := uint64(1)
-	bc := core.NewBlockchain(db, dif)
 	node, err := NewNode(privK, bc, true)
 	assert.Nil(t, err)
 
@@ -128,6 +127,7 @@ func TestFromGenesisToTenBlocks(t *testing.T) {
 	assert.NotEqual(t, genesisBlock.Signature, core.Signature{})
 	assert.NotEqual(t, genesisBlock.Hash, core.Hash{})
 
+	assert.True(t, node.Bc.VerifyBlock(genesisBlock))
 	// add the genesis block into the blockchain
 	err = node.Bc.AddBlock(genesisBlock)
 	assert.Nil(t, err)
@@ -135,7 +135,9 @@ func TestFromGenesisToTenBlocks(t *testing.T) {
 	assert.Equal(t, genesisBlock.Hash, node.Bc.LastBlock.Hash)
 
 	// TODO add another block
-	block := node.NewBlock([]core.Tx{})
+	block, err := node.NewBlock([]core.Tx{})
+	assert.Nil(t, err)
+	block.Print()
 	err = node.Bc.AddBlock(block)
 	assert.Nil(t, err)
 }