From 5cc2c071572daab876db2fd82e9d16dc4c34aa11 Mon Sep 17 00:00:00 2001 From: Chirantan Ekbote Date: Tue, 6 Sep 2022 15:18:45 +0900 Subject: [PATCH] node: Remove deprecated grpc method This is triggering the lint check. --- node/cmd/guardiand/adminclient.go | 5 +++-- node/cmd/guardiand/publicweb.go | 3 ++- node/hack/findmissing/findmissing.go | 3 ++- node/hack/repair_eth/repair_eth.go | 3 ++- node/hack/repair_solana/repair.go | 3 ++- node/hack/repair_terra/repair.go | 3 ++- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/node/cmd/guardiand/adminclient.go b/node/cmd/guardiand/adminclient.go index 2cd482562..b721a9d24 100644 --- a/node/cmd/guardiand/adminclient.go +++ b/node/cmd/guardiand/adminclient.go @@ -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" @@ -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) @@ -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) diff --git a/node/cmd/guardiand/publicweb.go b/node/cmd/guardiand/publicweb.go index 507316b6e..56e0d01ad 100644 --- a/node/cmd/guardiand/publicweb.go +++ b/node/cmd/guardiand/publicweb.go @@ -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 { @@ -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) } diff --git a/node/hack/findmissing/findmissing.go b/node/hack/findmissing/findmissing.go index 7066fe047..7343df771 100644 --- a/node/hack/findmissing/findmissing.go +++ b/node/hack/findmissing/findmissing.go @@ -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 ( @@ -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) diff --git a/node/hack/repair_eth/repair_eth.go b/node/hack/repair_eth/repair_eth.go index 50899ed89..fb29e87e0 100644 --- a/node/hack/repair_eth/repair_eth.go +++ b/node/hack/repair_eth/repair_eth.go @@ -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{ @@ -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) diff --git a/node/hack/repair_solana/repair.go b/node/hack/repair_solana/repair.go index 76bcf779b..1a83dc3b9 100644 --- a/node/hack/repair_solana/repair.go +++ b/node/hack/repair_solana/repair.go @@ -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 ( @@ -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) diff --git a/node/hack/repair_terra/repair.go b/node/hack/repair_terra/repair.go index d2aa79657..1faf0529b 100644 --- a/node/hack/repair_terra/repair.go +++ b/node/hack/repair_terra/repair.go @@ -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{ @@ -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)