Merge branch 'main' into am/fix-amino-codec

cosmos · Oct 11, 2022 · dfa9688 · dfa9688
2 parents b56423a + 1917e92
commit dfa9688
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -23,4 +23,4 @@ jobs:
         uses: golangci/golangci-lint-action@v3
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.49.0
+          version: v1.50.0
diff --git a/Makefile b/Makefile
@@ -355,7 +355,7 @@ benchmark:
 ###############################################################################
 
 golangci_lint_cmd=golangci-lint
-golangci_version=v1.49.0
+golangci_version=v1.50.0
 
 lint:
 	@echo "--> Running linter"

diff --git a/orm/internal/codegen/codegen.go b/orm/internal/codegen/codegen.go
@@ -56,7 +56,7 @@ func QueryProtoPluginRunner(p *protogen.Plugin) error {
 			continue
 		}
 
-		out, err := os.OpenFile(fmt.Sprintf("%s_query.proto", f.GeneratedFilenamePrefix), os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0644)
+		out, err := os.OpenFile(fmt.Sprintf("%s_query.proto", f.GeneratedFilenamePrefix), os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0o644)
 		if err != nil {
 			return err
 		}

diff --git a/orm/internal/codegen/query.go b/orm/internal/codegen/query.go
@@ -243,6 +243,7 @@ func (g queryProtoGen) genSingletonRPCMethods(msg *protogen.Message) error {
 	g.msgs.F("")
 	return nil
 }
+
 func (g queryProtoGen) startRequestType(format string, args ...any) {
 	g.startRequestResponseType("request", format, args...)
 }
@@ -298,7 +299,6 @@ func (w *writer) F(format string, args ...interface{}) {
 	if err != nil {
 		panic(err)
 	}
-
 }
 
 func (w *writer) Indent() {

diff --git a/orm/internal/testpb/bank.cosmos_orm.go b/orm/internal/testpb/bank.cosmos_orm.go
diff --git a/orm/internal/testpb/test_schema.cosmos_orm.go b/orm/internal/testpb/test_schema.cosmos_orm.go
diff --git a/server/grpc/gogoreflection/fix_registration.go b/server/grpc/gogoreflection/fix_registration.go
@@ -14,9 +14,9 @@ import (
 	dpb "github.com/golang/protobuf/protoc-gen-go/descriptor"
 )
 
+// importsToFix lets us now that we're only fixing gogoproto/gogoproto.proto imports, we're not fixing cosmos protos.
 var importsToFix = map[string]string{
 	"gogo.proto": "gogoproto/gogo.proto",
-	// "cosmos.proto": "cosmos_proto/cosmos.proto",
 }
 
 // fixRegistration is required because certain files register themselves in a way
@@ -109,7 +109,8 @@ func getExtension(extID int32, m proto.Message) *gogoproto.ExtensionDesc {
 	}
 
 	// check into proto registry
-	for id, desc := range proto.RegisteredExtensions(m) { //nolint:staticcheck
+	//nolint:staticcheck // Seems likely that we should refactor this file.
+	for id, desc := range proto.RegisteredExtensions(m) {
 		if id == extID {
 			return &gogoproto.ExtensionDesc{
 				ExtendedType:  desc.ExtendedType,

diff --git a/tx/textual/valuerenderer/duration.go b/tx/textual/valuerenderer/duration.go
@@ -119,9 +119,7 @@ func (dr durationValueRenderer) Format(_ context.Context, v protoreflect.Value,
 	return err
 }
 
-var (
-	durRegexp = regexp.MustCompile(`^(-)?(?:([0-9]+) days?)?(?:, )?(?:([0-9]+) hours?)?(?:, )?(?:([0-9]+) minutes?)?(?:, )?(?:([0-9]+)(?:\.([0-9]+))? seconds?)?$`)
-)
+var durRegexp = regexp.MustCompile(`^(-)?(?:([0-9]+) days?)?(?:, )?(?:([0-9]+) hours?)?(?:, )?(?:([0-9]+) minutes?)?(?:, )?(?:([0-9]+)(?:\.([0-9]+))? seconds?)?$`)
 
 // Parse implements the ValueRenderer interface.
 func (dr durationValueRenderer) Parse(_ context.Context, r io.Reader) (protoreflect.Value, error) {

diff --git a/tx/textual/valuerenderer/duration_test.go b/tx/textual/valuerenderer/duration_test.go
@@ -56,7 +56,6 @@ func TestDurationJSON(t *testing.T) {
 			require.IsType(t, &dpb.Duration{}, msg)
 			duration := msg.(*dpb.Duration)
 			require.True(t, proto.Equal(duration, tc.Proto), "%v vs %v", duration, tc.Proto)
-
 		})
 	}
 }