From 21d479c4efd9a94514a245874d9e72bd07dccfa6 Mon Sep 17 00:00:00 2001
From: Mark Rushakoff <mark.rushakoff@gmail.com>
Date: Fri, 24 Feb 2023 10:02:56 -0500
Subject: [PATCH] chore(tx): fix staticcheck issues (#15150)

---
 x/tx/aminojson/json_marshal_test.go | 1 +
 x/tx/textual/bench_test.go          | 2 +-
 x/tx/textual/coin_test.go           | 8 ++++++--
 x/tx/textual/message.go             | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/x/tx/aminojson/json_marshal_test.go b/x/tx/aminojson/json_marshal_test.go
index d0333de3b3..9cbf6dd1ed 100644
--- a/x/tx/aminojson/json_marshal_test.go
+++ b/x/tx/aminojson/json_marshal_test.go
@@ -59,6 +59,7 @@ func TestAminoJSON_EdgeCases(t *testing.T) {
 			require.Equal(t, string(legacyBz), string(bz))
 
 			goProtoJSON, err := protojson.Marshal(tc.msg)
+			assert.NilError(t, err)
 			err = cdc.UnmarshalJSON(bz, msg2)
 			assert.NilError(t, err, "unmarshal failed: %s vs %s", legacyBz, goProtoJSON)
 		})
diff --git a/x/tx/textual/bench_test.go b/x/tx/textual/bench_test.go
index d09ae0d54a..0e2c4b7012 100644
--- a/x/tx/textual/bench_test.go
+++ b/x/tx/textual/bench_test.go
@@ -54,7 +54,7 @@ func BenchmarkDecimalValueRendererFormat(b *testing.B) {
 	b.ReportAllocs()
 
 	for i := 0; i < b.N; i++ {
-		for _, value := range intValues {
+		for _, value := range decimalValues {
 			if _, err := dvr.Format(ctx, value); err != nil {
 				b.Fatal(err)
 			}
diff --git a/x/tx/textual/coin_test.go b/x/tx/textual/coin_test.go
index 2b26151efa..b0943bae6b 100644
--- a/x/tx/textual/coin_test.go
+++ b/x/tx/textual/coin_test.go
@@ -16,9 +16,13 @@ import (
 	"cosmossdk.io/x/tx/textual"
 )
 
+// Dedicated type for context Values, to avoid conflicts,
+// per the (context.Context).WithValue docs.
+type mockCoinMetadata string
+
 // mockCoinMetadataKey is used in the mock coin metadata querier.
-func mockCoinMetadataKey(denom string) string {
-	return fmt.Sprintf("%s-%s", "coin-metadata", denom)
+func mockCoinMetadataKey(denom string) mockCoinMetadata {
+	return mockCoinMetadata(fmt.Sprintf("%s-%s", "coin-metadata", denom))
 }
 
 // mockCoinMetadataQuerier is a mock querier for coin metadata used for test
diff --git a/x/tx/textual/message.go b/x/tx/textual/message.go
index f45c8ac7d9..9affadba86 100644
--- a/x/tx/textual/message.go
+++ b/x/tx/textual/message.go
@@ -54,7 +54,7 @@ func (mr *messageValueRenderer) Format(ctx context.Context, v protoreflect.Value
 			return nil, err
 		}
 
-		subscreens := make([]Screen, 0)
+		var subscreens []Screen
 		if fd.IsList() {
 			if r, ok := vr.(RepeatedValueRenderer); ok {
 				// If the field is a list, and handles its own repeated rendering