398 387 refactor and expose node scrambling and priority peers

api/api.go

@@ -28,7 +28,9 @@ func startGrpcServer(
 	kvExecutor kvdb.KVExecutorInterface,
 	queryExecutor query.ExecutorInterface,
 	p2pHostService p2p.Peer2PeerServiceInterface,
-	blockServices map[int32]coreService.BlockServiceInterface, ownerAccountAddress, nodefilePath string,
+	blockServices map[int32]coreService.BlockServiceInterface,
+	nodeRegistrationService coreService.NodeRegistrationServiceInterface,
+	ownerAccountAddress, nodefilePath string,
 	logger *log.Logger,
 ) {
 
@@ -78,7 +80,7 @@ func startGrpcServer(
 	})
 	// Set GRPC handler for Transactions requests
 	rpcService.RegisterHostServiceServer(grpcServer, &handler.HostHandler{
-		Service: service.NewHostService(queryExecutor, p2pHostService, blockServices),
+		Service: service.NewHostService(queryExecutor, p2pHostService, blockServices, nodeRegistrationService),
 	})
 	// Set GRPC handler for account balance requests
 	rpcService.RegisterAccountBalanceServiceServer(grpcServer, &handler.AccountBalanceHandler{
@@ -122,11 +124,13 @@ func Start(
 	kvExecutor kvdb.KVExecutorInterface,
 	queryExecutor query.ExecutorInterface,
 	p2pHostService p2p.Peer2PeerServiceInterface,
-	blockServices map[int32]coreService.BlockServiceInterface, ownerAccountAddress, nodefilePath string,
+	blockServices map[int32]coreService.BlockServiceInterface,
+	nodeRegistrationService coreService.NodeRegistrationServiceInterface,
+	ownerAccountAddress, nodefilePath string,
 	logger *log.Logger,
 ) {
 	startGrpcServer(
-		grpcPort, kvExecutor, queryExecutor, p2pHostService, blockServices, ownerAccountAddress, nodefilePath, logger,
+		grpcPort, kvExecutor, queryExecutor, p2pHostService, blockServices, nodeRegistrationService, ownerAccountAddress, nodefilePath, logger,
 	)
 	if restPort > 0 { // only start proxy service if apiHTTPPort set with value > 0
 		go func() {

api/service/hostApiService.go

@@ -14,22 +14,25 @@ type (
 	}
 
 	HostService struct {
-		Query         query.ExecutorInterface
-		BlockServices map[int32]coreService.BlockServiceInterface
-		P2pService    p2p.Peer2PeerServiceInterface
+		Query                   query.ExecutorInterface
+		P2pService              p2p.Peer2PeerServiceInterface
+		BlockServices           map[int32]coreService.BlockServiceInterface
+		NodeRegistrationService coreService.NodeRegistrationServiceInterface
 	}
 )
 
 var hostServiceInstance *HostService
 
 // NewHostService create a singleton instance of PeerExplorer
 func NewHostService(queryExecutor query.ExecutorInterface, p2pService p2p.Peer2PeerServiceInterface,
-	blockServices map[int32]coreService.BlockServiceInterface) HostServiceInterface {
+	blockServices map[int32]coreService.BlockServiceInterface,
+	nodeRegistrationService coreService.NodeRegistrationServiceInterface) HostServiceInterface {
 	if hostServiceInstance == nil {
 		hostServiceInstance = &HostService{
-			Query:         queryExecutor,
-			P2pService:    p2pService,
-			BlockServices: blockServices,
+			Query:                   queryExecutor,
+			P2pService:              p2pService,
+			BlockServices:           blockServices,
+			NodeRegistrationService: nodeRegistrationService,
 		}
 	}
 	return hostServiceInstance
@@ -48,9 +51,14 @@ func (hs *HostService) GetHostInfo() (*model.HostInfo, error) {
 			LastBlock: lastBlock,
 		})
 	}
+
+	scrambledNodes := hs.NodeRegistrationService.GetScrambledNodes()
+
 	return &model.HostInfo{
-		Host:          hs.P2pService.GetHostInfo(),
-		ChainStatuses: chainStatuses,
+		Host:                 hs.P2pService.GetHostInfo(),
+		ChainStatuses:        chainStatuses,
+		ScrambledNodes:       scrambledNodes.AddressNodes,
+		ScrambledNodesHeight: scrambledNodes.BlockHeight,
 	}, nil
 }