Enhance blocksmith selection

cmd/block/blockGenerator.go

@@ -2,8 +2,6 @@ package block
 
 import (
 	"fmt"
-	"strings"
-	"time"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -23,6 +21,8 @@ import (
 	"github.com/zoobc/zoobc-core/core/smith/strategy"
 	coreUtil "github.com/zoobc/zoobc-core/core/util"
 	"github.com/zoobc/zoobc-core/observer"
+	"strings"
+	"time"
 )
 
 type (
@@ -37,6 +37,7 @@ var (
 	blockProcessor          smith.BlockchainProcessorInterface
 	blockService            service.BlockServiceInterface
 	nodeRegistrationService service.NodeRegistrationServiceInterface
+	blockSmithStrategy      strategy.BlocksmithStrategyInterface
 	blocksmithStrategy      strategy.BlocksmithStrategyInterface
 	queryExecutor           query.ExecutorInterface
 	migration               database.Migration
@@ -192,7 +193,15 @@ func initialize(
 	)
 
 	blocksmithStrategy = strategy.NewBlocksmithStrategyMain(
-		queryExecutor, query.NewNodeRegistrationQuery(), query.NewSkippedBlocksmithQuery(), activeNodeRegistryCacheStorage, log.New(),
+		log.New(),
+		nil,
+		activeNodeRegistryCacheStorage,
+		query.NewSkippedBlocksmithQuery(),
+		query.NewBlockQuery(&chaintype.MainChain{}),
+		nil,
+		queryExecutor,
+		crypto.NewRandomNumberGenerator(),
+		nil,
 	)
 	publishedReceiptUtil := coreUtil.NewPublishedReceiptUtil(
 		query.NewPublishedReceiptQuery(),
@@ -254,6 +263,7 @@ func generateBlocks(numberOfBlocks int, blocksmithSecretPhrase, outputPath strin
 		log.New(),
 		&mockBlockchainStatusService{},
 		nodeRegistrationService,
+		blockSmithStrategy,
 	)
 	startTime := time.Now().UnixNano() / 1e6
 	fmt.Printf("generating %d blocks\n", numberOfBlocks)

common/model/blocksmith.go

@@ -10,12 +10,8 @@ import (
 type Blocksmith struct {
 	NodeID        int64
 	NodePublicKey []byte
-	NodeOrder     *big.Int
-	SmithOrder    uint32
 	Score         *big.Int
-	BlockSeed     int64
 	SecretPhrase  string
-	Deadline      uint32
 }
 
 // NewBlocksmith initiate generator

common/query/skippedBlocksmithQuery.go

@@ -12,6 +12,7 @@ import (
 
 type (
 	SkippedBlocksmithQueryInterface interface {
+		GetNumberOfSkippedBlocksmithsByBlockHeight(blockHeight uint32) (qStr string)
 		GetSkippedBlocksmithsByBlockHeight(blockHeight uint32) (qStr string)
 		InsertSkippedBlocksmith(skippedBlocksmith *model.SkippedBlocksmith) (qStr string, args []interface{})
 		InsertSkippedBlocksmiths(skippedBlockSmiths []*model.SkippedBlocksmith) (str string, args []interface{})
@@ -54,6 +55,14 @@ func (sbq *SkippedBlocksmithQuery) GetSkippedBlocksmithsByBlockHeight(blockHeigh
 	)
 }
 
+func (sbq *SkippedBlocksmithQuery) GetNumberOfSkippedBlocksmithsByBlockHeight(blockHeight uint32) string {
+	return fmt.Sprintf(
+		"SELECT COUNT(*) FROM %s WHERE block_height = %d",
+		sbq.getTableName(),
+		blockHeight,
+	)
+}
+
 func (sbq *SkippedBlocksmithQuery) InsertSkippedBlocksmith(
 	skippedBlocksmith *model.SkippedBlocksmith,
 ) (qStr string, args []interface{}) {

common/storage/blocksStorage.go

@@ -22,6 +22,7 @@ type (
 	BlockCacheObject struct {
 		ID        int64
 		Height    uint32
+		Timestamp int64
 		BlockHash []byte
 	}
 )

common/util/block.go

@@ -133,6 +133,7 @@ func GetBlockByHeightUseBlocksCache(
 	blockCacheObject.BlockHash = block.BlockHash
 	blockCacheObject.Height = block.Height
 	blockCacheObject.ID = block.ID
+	blockCacheObject.Timestamp = block.GetTimestamp()
 	return &blockCacheObject, nil
 }
 

core/blockchainsync/blockchainOrchestratorService_test.go

@@ -335,67 +335,3 @@ func TestBlockchainOrchestratorService_StartSyncChain(t *testing.T) {
 		})
 	}
 }
-
-func TestBlockchainOrchestratorService_Start(t *testing.T) {
-	type fields struct {
-		SpinechainSyncService          BlockchainSyncServiceInterface
-		MainchainSyncService           BlockchainSyncServiceInterface
-		BlockchainStatusService        service.BlockchainStatusServiceInterface
-		SpineBlockManifestService      service.SpineBlockManifestServiceInterface
-		FileDownloader                 p2p.FileDownloaderInterface
-		MainchainSnapshotBlockServices service.SnapshotBlockServiceInterface
-		Logger                         *log.Logger
-	}
-	tests := []struct {
-		name    string
-		fields  fields
-		wantErr bool
-	}{
-		{
-			name: "error:spineChainSyncError",
-			fields: fields{
-				SpinechainSyncService:   &MockBlockchainSyncServiceError{},
-				BlockchainStatusService: &MockBlockchainStatusServiceFinished{},
-				Logger:                  log.New(),
-			},
-			wantErr: true,
-		},
-		{
-			name: "error:mainChainSyncError",
-			fields: fields{
-				SpinechainSyncService:   &MockBlockchainSyncServiceSuccess{},
-				MainchainSyncService:    &MockBlockchainSyncServiceError{},
-				BlockchainStatusService: &MockBlockchainStatusServiceFinished{},
-				Logger:                  log.New(),
-			},
-			wantErr: true,
-		},
-		{
-			name: "success:allOperationsRunWell",
-			fields: fields{
-				SpinechainSyncService:   &MockBlockchainSyncServiceSuccess{},
-				MainchainSyncService:    &MockBlockchainSyncServiceSuccess{},
-				BlockchainStatusService: &MockBlockchainStatusServiceFinished{},
-				Logger:                  log.New(),
-			},
-			wantErr: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			bos := &BlockchainOrchestratorService{
-				SpinechainSyncService:          tt.fields.SpinechainSyncService,
-				MainchainSyncService:           tt.fields.MainchainSyncService,
-				BlockchainStatusService:        tt.fields.BlockchainStatusService,
-				SpineBlockManifestService:      tt.fields.SpineBlockManifestService,
-				FileDownloader:                 tt.fields.FileDownloader,
-				MainchainSnapshotBlockServices: tt.fields.MainchainSnapshotBlockServices,
-				Logger:                         tt.fields.Logger,
-			}
-
-			if err := bos.Start(); (err != nil) != tt.wantErr {
-				t.Errorf("BlockchainOrchestratorService.Start() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}

core/service/blockCoreService.go

@@ -55,9 +55,5 @@ type (
 		GetBlocksmithStrategy() strategy.BlocksmithStrategyInterface
 		ReceivedValidatedBlockTransactionsListener() observer.Listener
 		BlockTransactionsRequestedListener() observer.Listener
-		WillSmith(
-			blocksmith *model.Blocksmith,
-			blockchainProcessorLastBlockID int64,
-		) (lastBlockID, blocksmithIndex int64, err error)
 	}
 )