refactor(x/tx): Move textual,aminojson to signing (#15278)

contrib/images/simd-dlv/Dockerfile

@@ -14,6 +14,7 @@ COPY tools/rosetta/go.mod tools/rosetta/go.sum /work/tools/rosetta/
 COPY collections/go.mod collections/go.sum /work/collections/
 COPY store/go.mod store/go.sum /work/store/
 COPY log/go.mod log/go.sum /work/log/
+COPY x/tx/go.mod x/tx/go.sum /work/x/tx/
 RUN go mod download
 
 COPY ./ /work

contrib/images/simd-env/Dockerfile

@@ -13,6 +13,7 @@ COPY tools/rosetta/go.mod tools/rosetta/go.sum /work/tools/rosetta/
 COPY collections/go.mod collections/go.sum /work/collections/
 COPY store/go.mod store/go.sum /work/store/
 COPY log/go.mod log/go.sum /work/log/
+COPY x/tx/go.mod x/tx/go.sum /work/x/tx/
 RUN go mod download
 
 COPY ./ /work

go.mod

@@ -154,6 +154,9 @@ require (
 	nhooyr.io/websocket v1.8.6 // indirect
 )
 
+// Here are the short-lived replace of the Cosmos SDK
+replace cosmossdk.io/x/tx => ./x/tx
+
 // Below are the long-lived replace of the Cosmos SDK
 replace (
 	// use cosmos fork of keyring

go.sum

@@ -51,8 +51,6 @@ cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4 h1:/jnzJ9zFsL7qkV8
 cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4/go.mod h1:gUVtWwIzfSXqcOT+lBVz2jyjfua8DoBdzRsIyaUAT/8=
 cosmossdk.io/store v0.0.0-20230227103508-bbe7f8a11b44 h1:/pKsj/ApzO4+zMwpgLiPG5iakoHxziGpMiJcz4S+r4w=
 cosmossdk.io/store v0.0.0-20230227103508-bbe7f8a11b44/go.mod h1:flrxUykloEW1asE9p+Q+d8LSuNI3fBRdzISg9HTpYlQ=
-cosmossdk.io/x/tx v0.2.0 h1:53f5TIXhpPYJGMm47SUslcV2i8JNBEN3eE08BmxE/Zg=
-cosmossdk.io/x/tx v0.2.0/go.mod h1:CTko7wgt7aBdbxOesZ+Wo1uO/03ueKzIQ0iI323Rqgk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
 filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=

simapp/go.mod

@@ -196,6 +196,7 @@ replace (
 	cosmossdk.io/x/evidence => ../x/evidence
 	cosmossdk.io/x/feegrant => ../x/feegrant
 	cosmossdk.io/x/nft => ../x/nft
+	cosmossdk.io/x/tx => ../x/tx
 	cosmossdk.io/x/upgrade => ../x/upgrade
 )
 

simapp/go.sum

@@ -206,8 +206,6 @@ cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4 h1:/jnzJ9zFsL7qkV8
 cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4/go.mod h1:gUVtWwIzfSXqcOT+lBVz2jyjfua8DoBdzRsIyaUAT/8=
 cosmossdk.io/store v0.0.0-20230227103508-bbe7f8a11b44 h1:/pKsj/ApzO4+zMwpgLiPG5iakoHxziGpMiJcz4S+r4w=
 cosmossdk.io/store v0.0.0-20230227103508-bbe7f8a11b44/go.mod h1:flrxUykloEW1asE9p+Q+d8LSuNI3fBRdzISg9HTpYlQ=
-cosmossdk.io/x/tx v0.2.0 h1:53f5TIXhpPYJGMm47SUslcV2i8JNBEN3eE08BmxE/Zg=
-cosmossdk.io/x/tx v0.2.0/go.mod h1:CTko7wgt7aBdbxOesZ+Wo1uO/03ueKzIQ0iI323Rqgk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
 filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=

tests/integration/aminojson/aminojson_test.go

@@ -44,7 +44,7 @@ import (
 	evidencetypes "cosmossdk.io/x/evidence/types"
 	feegranttypes "cosmossdk.io/x/feegrant"
 	feegrantmodule "cosmossdk.io/x/feegrant/module"
-	"cosmossdk.io/x/tx/aminojson"
+	"cosmossdk.io/x/tx/signing/aminojson"
 	"cosmossdk.io/x/upgrade"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"

tests/integration/aminojson/repeated_test.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"cosmossdk.io/x/tx/aminojson"
+	"cosmossdk.io/x/tx/signing/aminojson"
 	"github.com/cosmos/cosmos-sdk/codec"
 	gogopb "github.com/cosmos/cosmos-sdk/tests/integration/aminojson/internal/gogo/testpb"
 	pulsarpb "github.com/cosmos/cosmos-sdk/tests/integration/aminojson/internal/pulsar/testpb"

x/auth/tx/config.go

@@ -3,7 +3,7 @@ package tx
 import (
 	"fmt"
 
-	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/signing/textual"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"

x/auth/tx/config/textual.go

@@ -8,7 +8,7 @@ import (
 	grpcstatus "google.golang.org/grpc/status"
 
 	bankv1beta1 "cosmossdk.io/api/cosmos/bank/v1beta1"
-	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/signing/textual"
 
 	"github.com/cosmos/cosmos-sdk/x/bank/types"
 )

x/auth/tx/mode_handler.go

@@ -3,7 +3,7 @@ package tx
 import (
 	"fmt"
 
-	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/signing/textual"
 
 	signingtypes "github.com/cosmos/cosmos-sdk/types/tx/signing"
 	"github.com/cosmos/cosmos-sdk/x/auth/signing"

x/auth/tx/textual.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	txv1beta1 "cosmossdk.io/api/cosmos/tx/v1beta1"
-	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/signing/textual"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/anypb"
 

x/tx/CHANGELOG.md

@@ -30,3 +30,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 # Changelog
 
 ## [Unreleased]
+
+## API Breaking
+
+* [#15278](https://github.com/cosmos/cosmos-sdk/pull/15278) Move `x/tx/{textual,aminojson}` into `x/tx/signing`.

x/tx/signing/aminojson/json_marshal_test.go

@@ -13,9 +13,9 @@ import (
 
 	"gotest.tools/v3/assert"
 
-	"cosmossdk.io/x/tx/aminojson"
+	"cosmossdk.io/x/tx/signing/aminojson"
 
-	"cosmossdk.io/x/tx/aminojson/internal/testpb"
+	"cosmossdk.io/x/tx/signing/aminojson/internal/testpb"
 )
 
 func marshalLegacy(msg proto.Message) ([]byte, error) {

x/tx/signing/std/handler_map.go

@@ -5,7 +5,7 @@ import (
 
 	"cosmossdk.io/x/tx/signing"
 	"cosmossdk.io/x/tx/signing/direct"
-	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/signing/textual"
 )
 
 // SignModeOptions are options for configuring the standard sign mode handler map.

x/tx/signing/textual/any_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/require"
 
-	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/signing/textual"
 
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/reflect/protoreflect"

x/tx/signing/textual/bytes_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/reflect/protoreflect"
 
-	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/signing/textual"
 )
 
 func TestBytesJsonTestCases(t *testing.T) {

x/tx/signing/textual/coin_test.go

@@ -13,7 +13,7 @@ import (
 	bankv1beta1 "cosmossdk.io/api/cosmos/bank/v1beta1"
 	basev1beta1 "cosmossdk.io/api/cosmos/base/v1beta1"
 
-	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/signing/textual"
 )
 
 // Dedicated type for context Values, to avoid conflicts,

x/tx/signing/textual/coins_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/reflect/protoreflect"
 
-	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/signing/textual"
 )
 
 func TestCoinsJsonTestcases(t *testing.T) {

x/tx/signing/textual/dec_test.go

@@ -12,7 +12,7 @@ import (
 	"google.golang.org/protobuf/reflect/protoreflect"
 
 	"cosmossdk.io/math"
-	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/signing/textual"
 )
 
 func TestDecJsonTestcases(t *testing.T) {

x/tx/signing/textual/duration_test.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/signing/textual"
 	"github.com/stretchr/testify/require"
 
 	"google.golang.org/protobuf/proto"

x/tx/signing/textual/e2e_test.go

@@ -18,8 +18,8 @@ import (
 	_ "cosmossdk.io/api/cosmos/gov/v1"
 
 	"cosmossdk.io/x/tx/signing"
-	"cosmossdk.io/x/tx/textual"
-	"cosmossdk.io/x/tx/textual/internal/textualpb"
+	"cosmossdk.io/x/tx/signing/textual"
+	"cosmossdk.io/x/tx/signing/textual/internal/textualpb"
 )
 
 type e2eJsonTest struct {

x/tx/signing/textual/encode.go

@@ -3,7 +3,7 @@ package textual
 import (
 	"io"
 
-	"cosmossdk.io/x/tx/textual/internal/cbor"
+	"cosmossdk.io/x/tx/signing/textual/internal/cbor"
 )
 
 var (

x/tx/signing/textual/enum_test.go

@@ -14,7 +14,7 @@ import (
 	"google.golang.org/protobuf/testing/protocmp"
 
 	"cosmossdk.io/x/tx/internal/testpb"
-	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/signing/textual"
 )
 
 type enumTest struct {

x/tx/signing/textual/int_test.go

@@ -12,7 +12,7 @@ import (
 
 	"cosmossdk.io/math"
 
-	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/signing/textual"
 )
 
 func TestIntJsonTestcases(t *testing.T) {

x/tx/signing/textual/internal/cbor/cbor_test.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"testing"
 
-	"cosmossdk.io/x/tx/textual/internal/cbor"
+	"cosmossdk.io/x/tx/signing/textual/internal/cbor"
 	"github.com/stretchr/testify/require"
 )
 

x/tx/signing/textual/message_test.go

@@ -16,7 +16,7 @@ import (
 	"google.golang.org/protobuf/testing/protocmp"
 
 	"cosmossdk.io/x/tx/internal/testpb"
-	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/signing/textual"
 )
 
 func EmptyCoinMetadataQuerier(ctx context.Context, denom string) (*bankv1beta1.Metadata, error) {

x/tx/signing/textual/repeated_test.go

@@ -13,7 +13,7 @@ import (
 	"google.golang.org/protobuf/reflect/protoreflect"
 
 	"cosmossdk.io/x/tx/internal/testpb"
-	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/signing/textual"
 )
 
 type repeatedJsonTest struct {

x/tx/signing/textual/string_test.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/signing/textual"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/reflect/protoreflect"
 )

x/tx/signing/textual/timestamp_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/signing/textual"
 	"github.com/stretchr/testify/require"
 
 	"google.golang.org/protobuf/proto"

x/tx/signing/textual/tx.go

@@ -17,7 +17,7 @@ import (
 	signingv1beta1 "cosmossdk.io/api/cosmos/tx/signing/v1beta1"
 	txv1beta1 "cosmossdk.io/api/cosmos/tx/v1beta1"
 
-	"cosmossdk.io/x/tx/textual/internal/textualpb"
+	"cosmossdk.io/x/tx/signing/textual/internal/textualpb"
 )
 
 var (

x/tx/signing/textual/tx_test.go

@@ -22,8 +22,8 @@ import (
 	txv1beta1 "cosmossdk.io/api/cosmos/tx/v1beta1"
 
 	"cosmossdk.io/x/tx/signing"
-	"cosmossdk.io/x/tx/textual"
-	"cosmossdk.io/x/tx/textual/internal/textualpb"
+	"cosmossdk.io/x/tx/signing/textual"
+	"cosmossdk.io/x/tx/signing/textual/internal/textualpb"
 )
 
 // txJsonTestTx represents the type that in the JSON test

x/tx/signing/textual/valuerenderer.go

@@ -17,7 +17,7 @@ import (
 	cosmos_proto "github.com/cosmos/cosmos-proto"
 
 	"cosmossdk.io/x/tx/signing"
-	"cosmossdk.io/x/tx/textual/internal/textualpb"
+	"cosmossdk.io/x/tx/signing/textual/internal/textualpb"
 )
 
 // CoinMetadataQueryFn defines a function that queries state for the coin denom

x/tx/signing/textual/valuerenderer_test.go

@@ -8,7 +8,7 @@ import (
 	"google.golang.org/protobuf/reflect/protoreflect"
 
 	"cosmossdk.io/x/tx/internal/testpb"
-	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/signing/textual"
 )
 
 func TestDispatcher(t *testing.T) {