Skip to content

Commit

Permalink
node: Remove deprecated grpc method
Browse files Browse the repository at this point in the history
This is triggering the lint check.
  • Loading branch information
jynnantonix committed Sep 7, 2022
1 parent d0eb7dd commit 5cc2c07
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 7 deletions.
5 changes: 3 additions & 2 deletions node/cmd/guardiand/adminclient.go
Expand Up @@ -22,6 +22,7 @@ import (
"github.com/spf13/cobra"
"github.com/status-im/keycard-go/hexutils"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/protobuf/encoding/prototext"

nodev1 "github.com/certusone/wormhole/node/pkg/proto/node/v1"
Expand Down Expand Up @@ -137,7 +138,7 @@ var ClientChainGovernorResetReleaseTimerCmd = &cobra.Command{
}

func getAdminClient(ctx context.Context, addr string) (*grpc.ClientConn, nodev1.NodePrivilegedServiceClient, error) {
conn, err := grpc.DialContext(ctx, fmt.Sprintf("unix:///%s", addr), grpc.WithInsecure())
conn, err := grpc.DialContext(ctx, fmt.Sprintf("unix:///%s", addr), grpc.WithTransportCredentials(insecure.NewCredentials()))

if err != nil {
log.Fatalf("failed to connect to %s: %v", addr, err)
Expand All @@ -148,7 +149,7 @@ func getAdminClient(ctx context.Context, addr string) (*grpc.ClientConn, nodev1.
}

func getPublicRPCServiceClient(ctx context.Context, addr string) (*grpc.ClientConn, publicrpcv1.PublicRPCServiceClient, error) {
conn, err := grpc.DialContext(ctx, fmt.Sprintf("unix:///%s", addr), grpc.WithInsecure())
conn, err := grpc.DialContext(ctx, fmt.Sprintf("unix:///%s", addr), grpc.WithTransportCredentials(insecure.NewCredentials()))

if err != nil {
log.Fatalf("failed to connect to %s: %v", addr, err)
Expand Down
3 changes: 2 additions & 1 deletion node/cmd/guardiand/publicweb.go
Expand Up @@ -15,6 +15,7 @@ import (
"golang.org/x/crypto/acme"
"golang.org/x/crypto/acme/autocert"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
)

func allowCORSWrapper(h http.Handler) http.Handler {
Expand Down Expand Up @@ -59,7 +60,7 @@ func publicwebServiceRunnable(
ctx,
fmt.Sprintf("unix:///%s", upstreamAddr),
grpc.WithBlock(),
grpc.WithInsecure())
grpc.WithTransportCredentials(insecure.NewCredentials()))
if err != nil {
return fmt.Errorf("failed to dial upstream: %s", err)
}
Expand Down
3 changes: 2 additions & 1 deletion node/hack/findmissing/findmissing.go
Expand Up @@ -10,6 +10,7 @@ import (
nodev1 "github.com/certusone/wormhole/node/pkg/proto/node/v1"
"github.com/certusone/wormhole/node/pkg/vaa"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
)

var (
Expand All @@ -19,7 +20,7 @@ var (
)

func getAdminClient(ctx context.Context, addr string) (*grpc.ClientConn, error, nodev1.NodePrivilegedServiceClient) {
conn, err := grpc.DialContext(ctx, fmt.Sprintf("unix:///%s", addr), grpc.WithInsecure())
conn, err := grpc.DialContext(ctx, fmt.Sprintf("unix:///%s", addr), grpc.WithTransportCredentials(insecure.NewCredentials()))

if err != nil {
log.Fatalf("failed to connect to %s: %v", addr, err)
Expand Down
3 changes: 2 additions & 1 deletion node/hack/repair_eth/repair_eth.go
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/ethereum/go-ethereum/common/hexutil"
"golang.org/x/time/rate"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
)

var etherscanAPIMap = map[vaa.ChainID]string{
Expand Down Expand Up @@ -85,7 +86,7 @@ func usesBlockscout(chainId vaa.ChainID) bool {
}

func getAdminClient(ctx context.Context, addr string) (*grpc.ClientConn, error, nodev1.NodePrivilegedServiceClient) {
conn, err := grpc.DialContext(ctx, fmt.Sprintf("unix:///%s", addr), grpc.WithInsecure())
conn, err := grpc.DialContext(ctx, fmt.Sprintf("unix:///%s", addr), grpc.WithTransportCredentials(insecure.NewCredentials()))

if err != nil {
log.Fatalf("failed to connect to %s: %v", addr, err)
Expand Down
3 changes: 2 additions & 1 deletion node/hack/repair_solana/repair.go
Expand Up @@ -20,6 +20,7 @@ import (
"github.com/gagliardetto/solana-go/rpc"
"golang.org/x/time/rate"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
)

var (
Expand All @@ -33,7 +34,7 @@ const (
)

func getAdminClient(ctx context.Context, addr string) (*grpc.ClientConn, error, nodev1.NodePrivilegedServiceClient) {
conn, err := grpc.DialContext(ctx, fmt.Sprintf("unix:///%s", addr), grpc.WithInsecure())
conn, err := grpc.DialContext(ctx, fmt.Sprintf("unix:///%s", addr), grpc.WithTransportCredentials(insecure.NewCredentials()))

if err != nil {
log.Fatalf("failed to connect to %s: %v", addr, err)
Expand Down
3 changes: 2 additions & 1 deletion node/hack/repair_terra/repair.go
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/tidwall/gjson"
"golang.org/x/time/rate"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
)

var fcdMap = map[vaa.ChainID]string{
Expand Down Expand Up @@ -55,7 +56,7 @@ var (
)

func getAdminClient(ctx context.Context, addr string) (*grpc.ClientConn, error, nodev1.NodePrivilegedServiceClient) {
conn, err := grpc.DialContext(ctx, fmt.Sprintf("unix:///%s", addr), grpc.WithInsecure())
conn, err := grpc.DialContext(ctx, fmt.Sprintf("unix:///%s", addr), grpc.WithTransportCredentials(insecure.NewCredentials()))

if err != nil {
log.Fatalf("failed to connect to %s: %v", addr, err)
Expand Down

0 comments on commit 5cc2c07

Please sign in to comment.