Merge pull request #44 from TRON-US/BTFS-1137

BTFS-1137

crypto/crypto.go

@@ -155,4 +155,3 @@ func GetPubKeyFromPeerId(pid string) (ic.PubKey, error) {
 	}
 	return pubKey, nil
 }
-

crypto/crypto_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 const (
-	KeyString = "CAISIJFNZZd5ZSvi9OlJP/mz/vvUobvlrr2//QN4DzX/EShP"
+	KeyString  = "CAISIJFNZZd5ZSvi9OlJP/mz/vvUobvlrr2//QN4DzX/EShP"
 	EncryptKey = "Tron2theMoon1234"
 )
 

protos/hub/hub.proto

@@ -19,7 +19,7 @@ option java_package = "io.btfs.hub";
 import "github.com/tron-us/protobuf/gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 
-service HubQuery {
+service HubQueryService {
   rpc GetSettings(SettingsReq) returns (SettingsResp);
   rpc GetHosts(HostsReq) returns (HostsResp);
 }

protos/status/status.proto

@@ -26,6 +26,12 @@ service Status {
   rpc CollectError(NodeError) returns (google.protobuf.Empty);
 }
 
+service StatusService {
+  rpc UpdateMetrics(SignedMetrics) returns (google.protobuf.Empty);
+  rpc CollectHealth(NodeHealth) returns (google.protobuf.Empty);
+  rpc CollectError(NodeError) returns (google.protobuf.Empty);
+}
+
 message SignedMetrics {
   bytes public_key = 1;
   bytes signature = 2;

utils/grpc/client.go

@@ -11,14 +11,16 @@ import (
 	"strings"
 	"time"
 
-	"github.com/tron-us/go-btfs-common/protos/escrow"
-	"github.com/tron-us/go-btfs-common/protos/guard"
-	"github.com/tron-us/go-btfs-common/protos/hub"
-	"github.com/tron-us/go-btfs-common/protos/status"
+	escrowpb "github.com/tron-us/go-btfs-common/protos/escrow"
+	guardpb "github.com/tron-us/go-btfs-common/protos/guard"
+	hubpb "github.com/tron-us/go-btfs-common/protos/hub"
+	sharedpb "github.com/tron-us/go-btfs-common/protos/shared"
+	statuspb "github.com/tron-us/go-btfs-common/protos/status"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/connectivity"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/health/grpc_health_v1"
 )
 
 const (
@@ -47,14 +49,18 @@ func (g *ClientBuilder) doWithContext(ctx context.Context, f interface{}) error
 		return errors.New("failed to get connection")
 	}
 	switch v := f.(type) {
-	case func(context.Context, status.StatusClient) error:
-		return v(ctx, status.NewStatusClient(conn))
-	case func(context.Context, hub.HubQueryClient) error:
-		return v(ctx, hub.NewHubQueryClient(conn))
-	case func(context.Context, guard.GuardServiceClient) error:
-		return v(ctx, guard.NewGuardServiceClient(conn))
-	case func(context.Context, escrow.EscrowServiceClient) error:
-		return v(ctx, escrow.NewEscrowServiceClient(conn))
+	case func(context.Context, statuspb.StatusServiceClient) error:
+		return v(ctx, statuspb.NewStatusServiceClient(conn))
+	case func(context.Context, hubpb.HubQueryServiceClient) error:
+		return v(ctx, hubpb.NewHubQueryServiceClient(conn))
+	case func(context.Context, guardpb.GuardServiceClient) error:
+		return v(ctx, guardpb.NewGuardServiceClient(conn))
+	case func(context.Context, escrowpb.EscrowServiceClient) error:
+		return v(ctx, escrowpb.NewEscrowServiceClient(conn))
+	case func(ctx context.Context, client sharedpb.RuntimeServiceClient) error:
+		return v(ctx, sharedpb.NewRuntimeServiceClient(conn))
+	case func(ctx context.Context, client grpc_health_v1.HealthClient) error:
+		return v(ctx, grpc_health_v1.NewHealthClient(conn))
 	default:
 		return fmt.Errorf("illegal function: %T", f)
 	}

utils/grpc/escrow.go

@@ -2,7 +2,8 @@ package grpc
 
 import (
 	"context"
-	"github.com/tron-us/go-btfs-common/protos/escrow"
+
+	escrowpb "github.com/tron-us/go-btfs-common/protos/escrow"
 )
 
 func EscrowClient(addr string) *EscrowClientBuilder {
@@ -13,6 +14,7 @@ type EscrowClientBuilder struct {
 	ClientBuilder
 }
 
-func (g *EscrowClientBuilder) WithContext(ctx context.Context, f func(ctx context.Context, client escrow.EscrowServiceClient) error) error {
+func (g *EscrowClientBuilder) WithContext(ctx context.Context, f func(ctx context.Context,
+	client escrowpb.EscrowServiceClient) error) error {
 	return g.doWithContext(ctx, f)
 }

utils/grpc/guard.go

@@ -2,7 +2,8 @@ package grpc
 
 import (
 	"context"
-	"github.com/tron-us/go-btfs-common/protos/guard"
+
+	guardpb "github.com/tron-us/go-btfs-common/protos/guard"
 )
 
 func GuardClient(addr string) *GuardClientBuilder {
@@ -13,6 +14,7 @@ type GuardClientBuilder struct {
 	ClientBuilder
 }
 
-func (g *GuardClientBuilder) WithContext(ctx context.Context, f func(ctx context.Context, client guard.GuardServiceClient) error) error {
+func (g *GuardClientBuilder) WithContext(ctx context.Context, f func(ctx context.Context,
+	client guardpb.GuardServiceClient) error) error {
 	return g.doWithContext(ctx, f)
 }

utils/grpc/health_check.go

@@ -0,0 +1,19 @@
+package grpc
+
+import (
+	"context"
+	"google.golang.org/grpc/health/grpc_health_v1"
+)
+
+func HealthCheckClient(addr string) *HealthCheckClientBuilder {
+	return &HealthCheckClientBuilder{builder(addr)}
+}
+
+type HealthCheckClientBuilder struct {
+	ClientBuilder
+}
+
+func (g *HealthCheckClientBuilder) WithContext(ctx context.Context, f func(ctx context.Context,
+	client grpc_health_v1.HealthClient) error) error {
+	return g.doWithContext(ctx, f)
+}