DE-labtory#723 issue

blockchain/api/block_api.go

@@ -55,6 +55,23 @@ func (bApi BlockApi) SyncIsProgressing() blockchain.ProgressState {
 	return blockchain.DONE
 }
 
+func (api BlockApi) ConsentBlock(consensusType string, block blockchain.DefaultBlock) error {
+	if consensusType == "solo" {
+		return api.CommitBlock(block)
+	}
+
+	if consensusType == "pbft" {
+		event, err := createBlockCreatedEvent(block)
+		if err != nil {
+			return err
+		}
+		return api.eventService.Publish("block.consent", event)
+	}
+
+	logger.Error(nil, fmt.Sprintf("[blockchain] undefined consensus type: %v", consensusType))
+	return ErrUndefinedConsensusType
+}
+
 func (bApi BlockApi) CommitGenesisBlock(GenesisConfPath string) error {
 	logger.Info(nil, "[Blockchain] Committing genesis block")
 
@@ -154,3 +171,19 @@ func createBlockCommittedEvent(block blockchain.DefaultBlock) (event.BlockCommit
 		State:     blockchain.Committed,
 	}, nil
 }
+
+func createBlockCreatedEvent(block blockchain.DefaultBlock) (event.BlockCreated, error) {
+
+	txList := blockchain.ConvBackFromTransactionList(block.TxList)
+
+	return event.BlockCreated{
+		Seal:      block.GetSeal(),
+		PrevSeal:  block.GetPrevSeal(),
+		Height:    block.GetHeight(),
+		TxList:    txList,
+		TxSeal:    block.GetTxSeal(),
+		Timestamp: block.GetTimestamp(),
+		Creator:   block.GetCreator(),
+		State:     block.GetState(),
+	}, nil
+}

blockchain/api/errors.go

@@ -23,3 +23,4 @@ var ErrSaveBlock = errors.New("Error in saving block")
 var ErrCreateEvent = errors.New("Error in creating event")
 var ErrGetLastBlock = errors.New("Error in getting last block")
 var ErrCreateProposedBlock = errors.New("Error in creating proposed block")
+var ErrUndefinedConsensusType = errors.New("Error in consensus type")

blockchain/infra/adapter/block_propose_command_handler.go

@@ -22,22 +22,20 @@ import (
 	"github.com/it-chain/engine/common/rabbitmq/rpc"
 )
 
-type BlockCommitApi interface {
+type BlockProposeApi interface {
 	CreateProposedBlock(txList []*blockchain.DefaultTransaction) (blockchain.DefaultBlock, error)
-	CommitBlock(txList blockchain.DefaultBlock) error
+	ConsentBlock(consensusType string, block blockchain.DefaultBlock) error
 }
 
 type BlockProposeCommandHandler struct {
-	blockApi         BlockCommitApi
-	consensusService blockchain.ConsensusService
-	engineMode       string
+	blockApi   BlockProposeApi
+	engineMode string
 }
 
-func NewBlockProposeCommandHandler(blockApi BlockCommitApi, consensusService blockchain.ConsensusService, engineMode string) *BlockProposeCommandHandler {
+func NewBlockProposeCommandHandler(blockApi BlockProposeApi, engineMode string) *BlockProposeCommandHandler {
 	return &BlockProposeCommandHandler{
-		blockApi:         blockApi,
-		consensusService: consensusService,
-		engineMode:       engineMode,
+		blockApi:   blockApi,
+		engineMode: engineMode,
 	}
 }
 
@@ -54,17 +52,7 @@ func (h *BlockProposeCommandHandler) HandleProposeBlockCommand(command command.P
 		return struct{}{}, rpc.Error{Message: err.Error()}
 	}
 
-	if h.engineMode == "solo" {
-		err = h.blockApi.CommitBlock(proposedBlock)
-		if err != nil {
-			return struct{}{}, rpc.Error{Message: err.Error()}
-		}
-
-		return struct{}{}, rpc.Error{}
-	}
-
-	err = h.consensusService.ConsentBlock(proposedBlock)
-	if err != nil {
+	if err := h.blockApi.ConsentBlock(h.engineMode, proposedBlock); err != nil {
 		return struct{}{}, rpc.Error{Message: err.Error()}
 	}
 

blockchain/infra/adapter/block_propose_command_handler_test.go

@@ -58,11 +58,6 @@ func TestBlockProposeCommandHandler_HandleProposeBlockCommand_Solo(t *testing.T)
 
 	subscriber.SubscribeTopic("block.*", handler)
 
-	consensusService := mock.ConsensusService{}
-	consensusService.ConsensusBlockFunc = func(block blockchain.DefaultBlock) error {
-		return nil
-	}
-
 	//set bApi
 	publisherID := "junksound"
 	dbPath := "./.db"
@@ -85,7 +80,7 @@ func TestBlockProposeCommandHandler_HandleProposeBlockCommand_Solo(t *testing.T)
 	bApi, err := api.NewBlockApi(publisherID, br, eventService, blockPool)
 	assert.NoError(t, err)
 
-	commandHandler := adapter.NewBlockProposeCommandHandler(bApi, consensusService, "solo")
+	commandHandler := adapter.NewBlockProposeCommandHandler(bApi, "solo")
 
 	//when
 	_, errRPC := commandHandler.HandleProposeBlockCommand(command.ProposeBlock{TxList: nil})
@@ -165,25 +160,14 @@ func TestBlockProposeCommandHandler_HandleProposeBlockCommand_NotSolo_OneTransac
 	err = blockRepository.AddBlock(prevBlock)
 	assert.NoError(t, err)
 
-	consensusService := mock.ConsensusService{}
-	consensusService.ConsensusBlockFunc = func(block blockchain.DefaultBlock) error {
-		t.Log("consensus service")
-		assert.Equal(t, uint64(1), block.GetHeight())
-		assert.Equal(t, prevBlock.GetSeal(), block.GetPrevSeal())
-		assert.Equal(t, "iAmPublisher", block.Creator)
-		assert.Equal(t, 1, len(block.GetTxList()))
-		wg.Done()
-		return nil
-	}
-
 	publisherID := "iAmPublisher"
 	eventService := common.NewEventService("", "Event")
 	blockPool := blockchain.NewBlockPool()
 
 	api, err := api.NewBlockApi(publisherID, blockRepository, eventService, blockPool)
 	assert.NoError(t, err)
 
-	commandHandler := adapter.NewBlockProposeCommandHandler(api, consensusService, "notSolo")
+	commandHandler := adapter.NewBlockProposeCommandHandler(api, "notSolo")
 
 	//when
 	_, errRPC := commandHandler.HandleProposeBlockCommand(command.ProposeBlock{
@@ -222,25 +206,14 @@ func TestBlockProposeCommandHandler_HandleProposeBlockCommand_NotSolo_TwoTransac
 	err = blockRepository.AddBlock(prevBlock)
 	assert.NoError(t, err)
 
-	consensusService := mock.ConsensusService{}
-	consensusService.ConsensusBlockFunc = func(block blockchain.DefaultBlock) error {
-		t.Log("consensus service")
-		assert.Equal(t, uint64(1), block.GetHeight())
-		assert.Equal(t, prevBlock.GetSeal(), block.GetPrevSeal())
-		assert.Equal(t, "iAmPublisher", block.Creator)
-		assert.Equal(t, 2, len(block.GetTxList()))
-		wg.Done()
-		return nil
-	}
-
 	publisherID := "iAmPublisher"
 	eventService := common.NewEventService("", "Event")
 	blockPool := blockchain.NewBlockPool()
 
 	api, err := api.NewBlockApi(publisherID, blockRepository, eventService, blockPool)
 	assert.NoError(t, err)
 
-	commandHandler := adapter.NewBlockProposeCommandHandler(api, consensusService, "notSolo")
+	commandHandler := adapter.NewBlockProposeCommandHandler(api, "notSolo")
 
 	//when
 	_, errRPC := commandHandler.HandleProposeBlockCommand(command.ProposeBlock{
@@ -288,20 +261,14 @@ func TestBlockProposeCommandHandler_HandleProposeBlockCommand_NotSolo_ExceptionC
 	err = blockRepository.AddBlock(prevBlock)
 	assert.NoError(t, err)
 
-	consensusService := mock.ConsensusService{}
-	consensusService.ConsensusBlockFunc = func(block blockchain.DefaultBlock) error {
-		t.Log("consensus service")
-		return ErrConsesnsusService
-	}
-
 	publisherID := "iAmPublisher"
 	eventService := common.NewEventService("", "Event")
 	blockPool := blockchain.NewBlockPool()
 
 	api, err := api.NewBlockApi(publisherID, blockRepository, eventService, blockPool)
 	assert.NoError(t, err)
 
-	commandHandler := adapter.NewBlockProposeCommandHandler(api, consensusService, "notSolo")
+	commandHandler := adapter.NewBlockProposeCommandHandler(api, "notSolo")
 
 	//when
 	_, errRPC := commandHandler.HandleProposeBlockCommand(command.ProposeBlock{TxList: nil})

blockchain/infra/adapter/errors.go

@@ -21,7 +21,9 @@ import "errors"
 var ErrBlockNil = errors.New("Block nil error")
 var ErrBlockTypeCasting = errors.New("Error in type casting block")
 var ErrCommandTransactions = errors.New("command's transactions nil or have length of zero")
+var ErrCommandSeal = errors.New("command's transactions nil")
 var ErrTxHasMissingProperties = errors.New("Tx has missing properties")
 var ErrBlockIdNil = errors.New("Error command model ID is nil")
 var ErrTxResultsLengthOfZero = errors.New("Error length of tx results is zero")
 var ErrTxResultsFail = errors.New("Error not all tx results success")
+var ErrCreateEvent = errors.New("Error in creating consent event")

blockchain/test/mock/mock_api.go

@@ -72,6 +72,14 @@ func (ba MockSyncBlockApi) SyncedCheck(block blockchain.Block) error {
 	return ba.SyncedCheckFunc(block)
 }
 
+type CreateEventHandler struct {
+	HandleFunc func(event event.BlockCreated)
+}
+
+func (h *CreateEventHandler) Handle(event event.BlockCreated) {
+	h.HandleFunc(event)
+}
+
 type CommitEventHandler struct {
 	HandleFunc func(event event.BlockCommitted)
 }

doc/TUTORIAL.md

@@ -72,7 +72,7 @@ Sample icode url:  https://github.com/junbeomlee/learn-icode
 
    - `it-chain ivm deploy [learn-icode-url] [ssh-private-key-path]`
 
-     `deploy` command clone from target repsoitory, and create docker container with that code 
+     `deploy` command clone from target repsoitory, and create docker container with that code
 
      ![[tutorial]deploy](./images/[tutorial]deploy.png)
 

it-chain.go

@@ -31,7 +31,6 @@ import (
 	blockchainApi "github.com/it-chain/engine/blockchain/api"
 	blockchainAdapter "github.com/it-chain/engine/blockchain/infra/adapter"
 	blockchainMem "github.com/it-chain/engine/blockchain/infra/mem"
-	"github.com/it-chain/engine/blockchain/test/mock"
 	"github.com/it-chain/engine/cmd/ivm"
 	"github.com/it-chain/engine/common"
 	"github.com/it-chain/engine/common/logger"
@@ -283,10 +282,7 @@ func initBlockchain(config *conf.Configuration, server rpc.Server) func() {
 		panic(err)
 	}
 
-	// TODO: Change with real consensus service
-	consensusService := mock.ConsensusService{}
-
-	blockProposeHandler := blockchainAdapter.NewBlockProposeCommandHandler(blockApi, consensusService, config.Engine.Mode)
+	blockProposeHandler := blockchainAdapter.NewBlockProposeCommandHandler(blockApi, config.Engine.Mode)
 	server.Register("block.propose", blockProposeHandler.HandleProposeBlockCommand)
 
 	return func() {