fix: remove grpc replace directive (#11089)
## Description Closes: #XXXX --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable)
This commit is contained in:
@@ -3,6 +3,8 @@ package config_test
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"github.com/cosmos/cosmos-sdk/codec"
|
||||
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
|
||||
"io"
|
||||
"os"
|
||||
"testing"
|
||||
@@ -27,7 +29,8 @@ func initClientContext(t *testing.T, envVar string) (client.Context, func()) {
|
||||
home := t.TempDir()
|
||||
clientCtx := client.Context{}.
|
||||
WithHomeDir(home).
|
||||
WithViper("")
|
||||
WithViper("").
|
||||
WithCodec(codec.NewProtoCodec(codectypes.NewInterfaceRegistry()))
|
||||
|
||||
clientCtx.Viper.BindEnv(nodeEnv)
|
||||
if envVar != "" {
|
||||
|
||||
+59
-6
@@ -2,15 +2,17 @@ package client
|
||||
|
||||
import (
|
||||
gocontext "context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/cosmos/cosmos-sdk/codec"
|
||||
proto "github.com/gogo/protobuf/proto"
|
||||
"google.golang.org/grpc/encoding"
|
||||
"reflect"
|
||||
"strconv"
|
||||
|
||||
gogogrpc "github.com/gogo/protobuf/grpc"
|
||||
abci "github.com/tendermint/tendermint/abci/types"
|
||||
"google.golang.org/grpc"
|
||||
"google.golang.org/grpc/encoding"
|
||||
"google.golang.org/grpc/encoding/proto"
|
||||
"google.golang.org/grpc/metadata"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/codec/types"
|
||||
@@ -21,7 +23,10 @@ import (
|
||||
|
||||
var _ gogogrpc.ClientConn = Context{}
|
||||
|
||||
var protoCodec = encoding.GetCodec(proto.Name)
|
||||
// fallBackCodec is used by Context in case Codec is not set.
|
||||
// it can process every gRPC type, except the ones which contain
|
||||
// interfaces in their types.
|
||||
var fallBackCodec = codec.NewProtoCodec(failingInterfaceRegistry{})
|
||||
|
||||
// Invoke implements the grpc ClientConn.Invoke method
|
||||
func (ctx Context) Invoke(grpcCtx gocontext.Context, method string, req, reply interface{}, opts ...grpc.CallOption) (err error) {
|
||||
@@ -50,8 +55,7 @@ func (ctx Context) Invoke(grpcCtx gocontext.Context, method string, req, reply i
|
||||
return err
|
||||
}
|
||||
|
||||
// Case 2. Querying state.
|
||||
reqBz, err := protoCodec.Marshal(req)
|
||||
reqBz, err := ctx.gRPCCodec().Marshal(req)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -83,7 +87,7 @@ func (ctx Context) Invoke(grpcCtx gocontext.Context, method string, req, reply i
|
||||
return err
|
||||
}
|
||||
|
||||
err = protoCodec.Unmarshal(res.Value, reply)
|
||||
err = ctx.gRPCCodec().Unmarshal(res.Value, reply)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -114,3 +118,52 @@ func (ctx Context) Invoke(grpcCtx gocontext.Context, method string, req, reply i
|
||||
func (Context) NewStream(gocontext.Context, *grpc.StreamDesc, string, ...grpc.CallOption) (grpc.ClientStream, error) {
|
||||
return nil, fmt.Errorf("streaming rpc not supported")
|
||||
}
|
||||
|
||||
// gRPCCodec checks if Context's Codec is codec.GRPCCodecProvider
|
||||
// otherwise it returns fallBackCodec.
|
||||
func (ctx Context) gRPCCodec() encoding.Codec {
|
||||
if ctx.Codec == nil {
|
||||
return fallBackCodec.GRPCCodec()
|
||||
}
|
||||
|
||||
pc, ok := ctx.Codec.(codec.GRPCCodecProvider)
|
||||
if !ok {
|
||||
return fallBackCodec.GRPCCodec()
|
||||
}
|
||||
|
||||
return pc.GRPCCodec()
|
||||
}
|
||||
|
||||
var _ types.InterfaceRegistry = failingInterfaceRegistry{}
|
||||
|
||||
// failingInterfaceRegistry is used by the fallback codec
|
||||
// in case Context's Codec is not set.
|
||||
type failingInterfaceRegistry struct{}
|
||||
|
||||
// errCodecNotSet is return by failingInterfaceRegistry in case there are attempt to decode
|
||||
// or encode a type which contains an interface field.
|
||||
var errCodecNotSet = errors.New("client: cannot encode or decode type which requires the application specific codec")
|
||||
|
||||
func (f failingInterfaceRegistry) UnpackAny(any *types.Any, iface interface{}) error {
|
||||
return errCodecNotSet
|
||||
}
|
||||
|
||||
func (f failingInterfaceRegistry) Resolve(typeUrl string) (proto.Message, error) {
|
||||
return nil, errCodecNotSet
|
||||
}
|
||||
|
||||
func (f failingInterfaceRegistry) RegisterInterface(protoName string, iface interface{}, impls ...proto.Message) {
|
||||
panic("cannot be called")
|
||||
}
|
||||
|
||||
func (f failingInterfaceRegistry) RegisterImplementations(iface interface{}, impls ...proto.Message) {
|
||||
panic("cannot be called")
|
||||
}
|
||||
|
||||
func (f failingInterfaceRegistry) ListAllInterfaces() []string {
|
||||
panic("cannot be called")
|
||||
}
|
||||
|
||||
func (f failingInterfaceRegistry) ListImplementations(ifaceTypeURL string) []string {
|
||||
panic("cannot be called")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user