fix(x/tx): default to using gogoproto.HybridResolver wherever possible

cosmos · Mar 24, 2024 · c65254b · c65254b
1 parent 4599439
commit c65254b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/x/tx/signing/aminojson/aminojson.go b/x/tx/signing/aminojson/aminojson.go
@@ -5,9 +5,11 @@ import (
 	"errors"
 	"fmt"
 
+	gogoproto "github.com/cosmos/gogoproto/proto"
 	"google.golang.org/protobuf/reflect/protoregistry"
 
 	signingv1beta1 "cosmossdk.io/api/cosmos/tx/signing/v1beta1"
+
 	"cosmossdk.io/x/tx/decode"
 	"cosmossdk.io/x/tx/signing"
 	"cosmossdk.io/x/tx/signing/aminojson/internal/aminojsonpb"
@@ -31,7 +33,7 @@ type SignModeHandlerOptions struct {
 func NewSignModeHandler(options SignModeHandlerOptions) *SignModeHandler {
 	h := &SignModeHandler{}
 	if options.FileResolver == nil {
-		h.fileResolver = protoregistry.GlobalFiles
+		h.fileResolver = gogoproto.HybridResolver
 	} else {
 		h.fileResolver = options.FileResolver
 	}

diff --git a/x/tx/signing/aminojson/json_marshal.go b/x/tx/signing/aminojson/json_marshal.go
@@ -7,6 +7,7 @@ import (
 	"io"
 	"sort"
 
+	gogoproto "github.com/cosmos/gogoproto/proto"
 	"github.com/pkg/errors"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
@@ -55,7 +56,7 @@ type Encoder struct {
 // rules.
 func NewEncoder(options EncoderOptions) Encoder {
 	if options.FileResolver == nil {
-		options.FileResolver = protoregistry.GlobalFiles
+		options.FileResolver = gogoproto.HybridResolver
 	}
 	if options.TypeResolver == nil {
 		options.TypeResolver = protoregistry.GlobalTypes

diff --git a/x/tx/signing/context.go b/x/tx/signing/context.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	cosmos_proto "github.com/cosmos/cosmos-proto"
+	gogoproto "github.com/cosmos/gogoproto/proto"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protodesc"
 	"google.golang.org/protobuf/reflect/protoreflect"
@@ -79,7 +80,7 @@ type ProtoFileResolver interface {
 func NewContext(options Options) (*Context, error) {
 	protoFiles := options.FileResolver
 	if protoFiles == nil {
-		protoFiles = protoregistry.GlobalFiles
+		protoFiles = gogoproto.HybridResolver
 	}
 
 	protoTypes := options.TypeResolver

diff --git a/x/tx/signing/textual/handler.go b/x/tx/signing/textual/handler.go
@@ -8,6 +8,7 @@ import (
 	"reflect"
 
 	cosmos_proto "github.com/cosmos/cosmos-proto"
+	gogoproto "github.com/cosmos/gogoproto/proto"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/reflect/protoregistry"
@@ -18,6 +19,7 @@ import (
 	bankv1beta1 "cosmossdk.io/api/cosmos/bank/v1beta1"
 	basev1beta1 "cosmossdk.io/api/cosmos/base/v1beta1"
 	signingv1beta1 "cosmossdk.io/api/cosmos/tx/signing/v1beta1"
+
 	"cosmossdk.io/x/tx/signing"
 	"cosmossdk.io/x/tx/signing/textual/internal/textualpb"
 )
@@ -71,7 +73,7 @@ func NewSignModeHandler(o SignModeOptions) (*SignModeHandler, error) {
 		return nil, errors.New("coinMetadataQuerier must be non-empty")
 	}
 	if o.FileResolver == nil {
-		o.FileResolver = protoregistry.GlobalFiles
+		o.FileResolver = gogoproto.HybridResolver
 	}
 	if o.TypeResolver == nil {
 		o.TypeResolver = protoregistry.GlobalTypes