From e9478df1619d7d0845dab3308852a9e2948269ac Mon Sep 17 00:00:00 2001 From: Amaury <1293565+amaurym@users.noreply.github.com> Date: Mon, 6 Mar 2023 19:17:24 +0100 Subject: [PATCH] refactor(x/tx): Move textual,aminojson to signing (#15278) --- contrib/images/simd-dlv/Dockerfile | 1 + contrib/images/simd-env/Dockerfile | 1 + go.mod | 3 +++ go.sum | 2 -- simapp/go.mod | 1 + simapp/go.sum | 2 -- tests/integration/aminojson/aminojson_test.go | 2 +- tests/integration/aminojson/repeated_test.go | 2 +- x/auth/tx/config.go | 2 +- x/auth/tx/config/textual.go | 2 +- x/auth/tx/mode_handler.go | 2 +- x/auth/tx/textual.go | 2 +- x/tx/CHANGELOG.md | 4 ++++ x/tx/{ => signing}/aminojson/.gitignore | 0 x/tx/{ => signing}/aminojson/any.go | 0 x/tx/{ => signing}/aminojson/encoder.go | 0 x/tx/{ => signing}/aminojson/internal/Makefile | 0 x/tx/{ => signing}/aminojson/internal/buf.gen.yaml | 0 x/tx/{ => signing}/aminojson/internal/buf.lock | 0 x/tx/{ => signing}/aminojson/internal/buf.yaml | 0 x/tx/{ => signing}/aminojson/internal/testpb/test.proto | 0 x/tx/{ => signing}/aminojson/internal/testpb/test.pulsar.go | 0 x/tx/{ => signing}/aminojson/json_marshal.go | 0 x/tx/{ => signing}/aminojson/json_marshal_test.go | 4 ++-- x/tx/{ => signing}/aminojson/options.go | 0 x/tx/{ => signing}/aminojson/time.go | 0 x/tx/signing/std/handler_map.go | 2 +- x/tx/{ => signing}/textual/any.go | 0 x/tx/{ => signing}/textual/any_test.go | 2 +- x/tx/{ => signing}/textual/bench_test.go | 0 x/tx/{ => signing}/textual/bytes.go | 0 x/tx/{ => signing}/textual/bytes_test.go | 2 +- x/tx/{ => signing}/textual/coin_test.go | 2 +- x/tx/{ => signing}/textual/coins.go | 0 x/tx/{ => signing}/textual/coins_test.go | 2 +- x/tx/{ => signing}/textual/dec.go | 0 x/tx/{ => signing}/textual/dec_test.go | 2 +- x/tx/{ => signing}/textual/duration.go | 0 x/tx/{ => signing}/textual/duration_test.go | 2 +- x/tx/{ => signing}/textual/e2e_test.go | 4 ++-- x/tx/{ => signing}/textual/encode.go | 2 +- x/tx/{ => signing}/textual/encode_test.go | 0 x/tx/{ => signing}/textual/enum.go | 0 x/tx/{ => signing}/textual/enum_test.go | 2 +- x/tx/{ => signing}/textual/int.go | 0 x/tx/{ => signing}/textual/int_test.go | 2 +- x/tx/{ => signing}/textual/internal/cbor/cbor.go | 0 x/tx/{ => signing}/textual/internal/cbor/cbor_test.go | 2 +- x/tx/{ => signing}/textual/internal/testdata/README.md | 0 x/tx/{ => signing}/textual/internal/testdata/any.json | 0 x/tx/{ => signing}/textual/internal/testdata/bytes.json | 0 x/tx/{ => signing}/textual/internal/testdata/coin.json | 0 x/tx/{ => signing}/textual/internal/testdata/coins.json | 0 x/tx/{ => signing}/textual/internal/testdata/decimals.json | 0 x/tx/{ => signing}/textual/internal/testdata/duration.json | 0 x/tx/{ => signing}/textual/internal/testdata/e2e.json | 0 x/tx/{ => signing}/textual/internal/testdata/encode.json | 0 x/tx/{ => signing}/textual/internal/testdata/enum.json | 0 x/tx/{ => signing}/textual/internal/testdata/integers.json | 0 x/tx/{ => signing}/textual/internal/testdata/message.json | 0 x/tx/{ => signing}/textual/internal/testdata/repeated.json | 0 x/tx/{ => signing}/textual/internal/testdata/string.json | 0 x/tx/{ => signing}/textual/internal/testdata/timestamp.json | 0 x/tx/{ => signing}/textual/internal/testdata/tx.json | 0 x/tx/{ => signing}/textual/internal/textualpb/Makefile | 0 x/tx/{ => signing}/textual/internal/textualpb/buf.gen.yaml | 0 x/tx/{ => signing}/textual/internal/textualpb/buf.lock | 0 x/tx/{ => signing}/textual/internal/textualpb/buf.yaml | 0 x/tx/{ => signing}/textual/internal/textualpb/doc.go | 0 x/tx/{ => signing}/textual/internal/textualpb/textual.proto | 0 .../textual/internal/textualpb/textual.pulsar.go | 0 x/tx/{ => signing}/textual/message.go | 0 x/tx/{ => signing}/textual/message_test.go | 2 +- x/tx/{ => signing}/textual/protoreflect_list_test.go | 0 x/tx/{ => signing}/textual/repeated_test.go | 2 +- x/tx/{ => signing}/textual/string.go | 0 x/tx/{ => signing}/textual/string_test.go | 2 +- x/tx/{ => signing}/textual/timestamp.go | 0 x/tx/{ => signing}/textual/timestamp_test.go | 2 +- x/tx/{ => signing}/textual/tx.go | 2 +- x/tx/{ => signing}/textual/tx_test.go | 4 ++-- x/tx/{ => signing}/textual/types.go | 0 x/tx/{ => signing}/textual/valuerenderer.go | 2 +- x/tx/{ => signing}/textual/valuerenderer_test.go | 2 +- 84 files changed, 40 insertions(+), 34 deletions(-) rename x/tx/{ => signing}/aminojson/.gitignore (100%) rename x/tx/{ => signing}/aminojson/any.go (100%) rename x/tx/{ => signing}/aminojson/encoder.go (100%) rename x/tx/{ => signing}/aminojson/internal/Makefile (100%) rename x/tx/{ => signing}/aminojson/internal/buf.gen.yaml (100%) rename x/tx/{ => signing}/aminojson/internal/buf.lock (100%) rename x/tx/{ => signing}/aminojson/internal/buf.yaml (100%) rename x/tx/{ => signing}/aminojson/internal/testpb/test.proto (100%) rename x/tx/{ => signing}/aminojson/internal/testpb/test.pulsar.go (100%) rename x/tx/{ => signing}/aminojson/json_marshal.go (100%) rename x/tx/{ => signing}/aminojson/json_marshal_test.go (97%) rename x/tx/{ => signing}/aminojson/options.go (100%) rename x/tx/{ => signing}/aminojson/time.go (100%) rename x/tx/{ => signing}/textual/any.go (100%) rename x/tx/{ => signing}/textual/any_test.go (97%) rename x/tx/{ => signing}/textual/bench_test.go (100%) rename x/tx/{ => signing}/textual/bytes.go (100%) rename x/tx/{ => signing}/textual/bytes_test.go (97%) rename x/tx/{ => signing}/textual/coin_test.go (99%) rename x/tx/{ => signing}/textual/coins.go (100%) rename x/tx/{ => signing}/textual/coins_test.go (98%) rename x/tx/{ => signing}/textual/dec.go (100%) rename x/tx/{ => signing}/textual/dec_test.go (97%) rename x/tx/{ => signing}/textual/duration.go (100%) rename x/tx/{ => signing}/textual/duration_test.go (97%) rename x/tx/{ => signing}/textual/e2e_test.go (95%) rename x/tx/{ => signing}/textual/encode.go (95%) rename x/tx/{ => signing}/textual/encode_test.go (100%) rename x/tx/{ => signing}/textual/enum.go (100%) rename x/tx/{ => signing}/textual/enum_test.go (98%) rename x/tx/{ => signing}/textual/int.go (100%) rename x/tx/{ => signing}/textual/int_test.go (98%) rename x/tx/{ => signing}/textual/internal/cbor/cbor.go (100%) rename x/tx/{ => signing}/textual/internal/cbor/cbor_test.go (98%) rename x/tx/{ => signing}/textual/internal/testdata/README.md (100%) rename x/tx/{ => signing}/textual/internal/testdata/any.json (100%) rename x/tx/{ => signing}/textual/internal/testdata/bytes.json (100%) rename x/tx/{ => signing}/textual/internal/testdata/coin.json (100%) rename x/tx/{ => signing}/textual/internal/testdata/coins.json (100%) rename x/tx/{ => signing}/textual/internal/testdata/decimals.json (100%) rename x/tx/{ => signing}/textual/internal/testdata/duration.json (100%) rename x/tx/{ => signing}/textual/internal/testdata/e2e.json (100%) rename x/tx/{ => signing}/textual/internal/testdata/encode.json (100%) rename x/tx/{ => signing}/textual/internal/testdata/enum.json (100%) rename x/tx/{ => signing}/textual/internal/testdata/integers.json (100%) rename x/tx/{ => signing}/textual/internal/testdata/message.json (100%) rename x/tx/{ => signing}/textual/internal/testdata/repeated.json (100%) rename x/tx/{ => signing}/textual/internal/testdata/string.json (100%) rename x/tx/{ => signing}/textual/internal/testdata/timestamp.json (100%) rename x/tx/{ => signing}/textual/internal/testdata/tx.json (100%) rename x/tx/{ => signing}/textual/internal/textualpb/Makefile (100%) rename x/tx/{ => signing}/textual/internal/textualpb/buf.gen.yaml (100%) rename x/tx/{ => signing}/textual/internal/textualpb/buf.lock (100%) rename x/tx/{ => signing}/textual/internal/textualpb/buf.yaml (100%) rename x/tx/{ => signing}/textual/internal/textualpb/doc.go (100%) rename x/tx/{ => signing}/textual/internal/textualpb/textual.proto (100%) rename x/tx/{ => signing}/textual/internal/textualpb/textual.pulsar.go (100%) rename x/tx/{ => signing}/textual/message.go (100%) rename x/tx/{ => signing}/textual/message_test.go (97%) rename x/tx/{ => signing}/textual/protoreflect_list_test.go (100%) rename x/tx/{ => signing}/textual/repeated_test.go (97%) rename x/tx/{ => signing}/textual/string.go (100%) rename x/tx/{ => signing}/textual/string_test.go (97%) rename x/tx/{ => signing}/textual/timestamp.go (100%) rename x/tx/{ => signing}/textual/timestamp_test.go (98%) rename x/tx/{ => signing}/textual/tx.go (99%) rename x/tx/{ => signing}/textual/tx_test.go (97%) rename x/tx/{ => signing}/textual/types.go (100%) rename x/tx/{ => signing}/textual/valuerenderer.go (99%) rename x/tx/{ => signing}/textual/valuerenderer_test.go (98%) diff --git a/contrib/images/simd-dlv/Dockerfile b/contrib/images/simd-dlv/Dockerfile index 9db0c901e3..55b591c7bd 100644 --- a/contrib/images/simd-dlv/Dockerfile +++ b/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 diff --git a/contrib/images/simd-env/Dockerfile b/contrib/images/simd-env/Dockerfile index aecdbc8b26..3b1b4521f7 100644 --- a/contrib/images/simd-env/Dockerfile +++ b/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 diff --git a/go.mod b/go.mod index 1e9ec0b262..37ef8d4b6f 100644 --- a/go.mod +++ b/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 diff --git a/go.sum b/go.sum index 5c48173445..6b9b2cdb74 100644 --- a/go.sum +++ b/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= diff --git a/simapp/go.mod b/simapp/go.mod index 96004de41f..95b47caeda 100644 --- a/simapp/go.mod +++ b/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 ) diff --git a/simapp/go.sum b/simapp/go.sum index 0330efbc5b..0cb94032f6 100644 --- a/simapp/go.sum +++ b/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= diff --git a/tests/integration/aminojson/aminojson_test.go b/tests/integration/aminojson/aminojson_test.go index 9e0733e234..ad8168a0fe 100644 --- a/tests/integration/aminojson/aminojson_test.go +++ b/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" diff --git a/tests/integration/aminojson/repeated_test.go b/tests/integration/aminojson/repeated_test.go index ae0a2bdfd4..0368214fa2 100644 --- a/tests/integration/aminojson/repeated_test.go +++ b/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" diff --git a/x/auth/tx/config.go b/x/auth/tx/config.go index ae1144a909..5cb00e9690 100644 --- a/x/auth/tx/config.go +++ b/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" diff --git a/x/auth/tx/config/textual.go b/x/auth/tx/config/textual.go index 3fe02f845b..28d1f39e6f 100644 --- a/x/auth/tx/config/textual.go +++ b/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" ) diff --git a/x/auth/tx/mode_handler.go b/x/auth/tx/mode_handler.go index 30bc6b1c08..25a2612b49 100644 --- a/x/auth/tx/mode_handler.go +++ b/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" diff --git a/x/auth/tx/textual.go b/x/auth/tx/textual.go index 890d5c9a07..7553f03596 100644 --- a/x/auth/tx/textual.go +++ b/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" diff --git a/x/tx/CHANGELOG.md b/x/tx/CHANGELOG.md index 16de809f27..5ef5614054 100644 --- a/x/tx/CHANGELOG.md +++ b/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`. diff --git a/x/tx/aminojson/.gitignore b/x/tx/signing/aminojson/.gitignore similarity index 100% rename from x/tx/aminojson/.gitignore rename to x/tx/signing/aminojson/.gitignore diff --git a/x/tx/aminojson/any.go b/x/tx/signing/aminojson/any.go similarity index 100% rename from x/tx/aminojson/any.go rename to x/tx/signing/aminojson/any.go diff --git a/x/tx/aminojson/encoder.go b/x/tx/signing/aminojson/encoder.go similarity index 100% rename from x/tx/aminojson/encoder.go rename to x/tx/signing/aminojson/encoder.go diff --git a/x/tx/aminojson/internal/Makefile b/x/tx/signing/aminojson/internal/Makefile similarity index 100% rename from x/tx/aminojson/internal/Makefile rename to x/tx/signing/aminojson/internal/Makefile diff --git a/x/tx/aminojson/internal/buf.gen.yaml b/x/tx/signing/aminojson/internal/buf.gen.yaml similarity index 100% rename from x/tx/aminojson/internal/buf.gen.yaml rename to x/tx/signing/aminojson/internal/buf.gen.yaml diff --git a/x/tx/aminojson/internal/buf.lock b/x/tx/signing/aminojson/internal/buf.lock similarity index 100% rename from x/tx/aminojson/internal/buf.lock rename to x/tx/signing/aminojson/internal/buf.lock diff --git a/x/tx/aminojson/internal/buf.yaml b/x/tx/signing/aminojson/internal/buf.yaml similarity index 100% rename from x/tx/aminojson/internal/buf.yaml rename to x/tx/signing/aminojson/internal/buf.yaml diff --git a/x/tx/aminojson/internal/testpb/test.proto b/x/tx/signing/aminojson/internal/testpb/test.proto similarity index 100% rename from x/tx/aminojson/internal/testpb/test.proto rename to x/tx/signing/aminojson/internal/testpb/test.proto diff --git a/x/tx/aminojson/internal/testpb/test.pulsar.go b/x/tx/signing/aminojson/internal/testpb/test.pulsar.go similarity index 100% rename from x/tx/aminojson/internal/testpb/test.pulsar.go rename to x/tx/signing/aminojson/internal/testpb/test.pulsar.go diff --git a/x/tx/aminojson/json_marshal.go b/x/tx/signing/aminojson/json_marshal.go similarity index 100% rename from x/tx/aminojson/json_marshal.go rename to x/tx/signing/aminojson/json_marshal.go diff --git a/x/tx/aminojson/json_marshal_test.go b/x/tx/signing/aminojson/json_marshal_test.go similarity index 97% rename from x/tx/aminojson/json_marshal_test.go rename to x/tx/signing/aminojson/json_marshal_test.go index 9cbf6dd1ed..e6b23d85ef 100644 --- a/x/tx/aminojson/json_marshal_test.go +++ b/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) { diff --git a/x/tx/aminojson/options.go b/x/tx/signing/aminojson/options.go similarity index 100% rename from x/tx/aminojson/options.go rename to x/tx/signing/aminojson/options.go diff --git a/x/tx/aminojson/time.go b/x/tx/signing/aminojson/time.go similarity index 100% rename from x/tx/aminojson/time.go rename to x/tx/signing/aminojson/time.go diff --git a/x/tx/signing/std/handler_map.go b/x/tx/signing/std/handler_map.go index c598051c90..c94ca03687 100644 --- a/x/tx/signing/std/handler_map.go +++ b/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. diff --git a/x/tx/textual/any.go b/x/tx/signing/textual/any.go similarity index 100% rename from x/tx/textual/any.go rename to x/tx/signing/textual/any.go diff --git a/x/tx/textual/any_test.go b/x/tx/signing/textual/any_test.go similarity index 97% rename from x/tx/textual/any_test.go rename to x/tx/signing/textual/any_test.go index a577d5835a..6a8f289ea1 100644 --- a/x/tx/textual/any_test.go +++ b/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" diff --git a/x/tx/textual/bench_test.go b/x/tx/signing/textual/bench_test.go similarity index 100% rename from x/tx/textual/bench_test.go rename to x/tx/signing/textual/bench_test.go diff --git a/x/tx/textual/bytes.go b/x/tx/signing/textual/bytes.go similarity index 100% rename from x/tx/textual/bytes.go rename to x/tx/signing/textual/bytes.go diff --git a/x/tx/textual/bytes_test.go b/x/tx/signing/textual/bytes_test.go similarity index 97% rename from x/tx/textual/bytes_test.go rename to x/tx/signing/textual/bytes_test.go index 18ae4ae94c..5ca1dcacdd 100644 --- a/x/tx/textual/bytes_test.go +++ b/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) { diff --git a/x/tx/textual/coin_test.go b/x/tx/signing/textual/coin_test.go similarity index 99% rename from x/tx/textual/coin_test.go rename to x/tx/signing/textual/coin_test.go index b0943bae6b..85160cacbf 100644 --- a/x/tx/textual/coin_test.go +++ b/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, diff --git a/x/tx/textual/coins.go b/x/tx/signing/textual/coins.go similarity index 100% rename from x/tx/textual/coins.go rename to x/tx/signing/textual/coins.go diff --git a/x/tx/textual/coins_test.go b/x/tx/signing/textual/coins_test.go similarity index 98% rename from x/tx/textual/coins_test.go rename to x/tx/signing/textual/coins_test.go index 96c13a9651..e7fdf12d0d 100644 --- a/x/tx/textual/coins_test.go +++ b/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) { diff --git a/x/tx/textual/dec.go b/x/tx/signing/textual/dec.go similarity index 100% rename from x/tx/textual/dec.go rename to x/tx/signing/textual/dec.go diff --git a/x/tx/textual/dec_test.go b/x/tx/signing/textual/dec_test.go similarity index 97% rename from x/tx/textual/dec_test.go rename to x/tx/signing/textual/dec_test.go index 3f76c71c32..a3204afdf0 100644 --- a/x/tx/textual/dec_test.go +++ b/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) { diff --git a/x/tx/textual/duration.go b/x/tx/signing/textual/duration.go similarity index 100% rename from x/tx/textual/duration.go rename to x/tx/signing/textual/duration.go diff --git a/x/tx/textual/duration_test.go b/x/tx/signing/textual/duration_test.go similarity index 97% rename from x/tx/textual/duration_test.go rename to x/tx/signing/textual/duration_test.go index 3cec014849..63b9463a56 100644 --- a/x/tx/textual/duration_test.go +++ b/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" diff --git a/x/tx/textual/e2e_test.go b/x/tx/signing/textual/e2e_test.go similarity index 95% rename from x/tx/textual/e2e_test.go rename to x/tx/signing/textual/e2e_test.go index 8d57bcd2eb..168e157e8e 100644 --- a/x/tx/textual/e2e_test.go +++ b/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 { diff --git a/x/tx/textual/encode.go b/x/tx/signing/textual/encode.go similarity index 95% rename from x/tx/textual/encode.go rename to x/tx/signing/textual/encode.go index 2181b3a5f6..af824be5ed 100644 --- a/x/tx/textual/encode.go +++ b/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 ( diff --git a/x/tx/textual/encode_test.go b/x/tx/signing/textual/encode_test.go similarity index 100% rename from x/tx/textual/encode_test.go rename to x/tx/signing/textual/encode_test.go diff --git a/x/tx/textual/enum.go b/x/tx/signing/textual/enum.go similarity index 100% rename from x/tx/textual/enum.go rename to x/tx/signing/textual/enum.go diff --git a/x/tx/textual/enum_test.go b/x/tx/signing/textual/enum_test.go similarity index 98% rename from x/tx/textual/enum_test.go rename to x/tx/signing/textual/enum_test.go index ff69d43c5a..ce109c607e 100644 --- a/x/tx/textual/enum_test.go +++ b/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 { diff --git a/x/tx/textual/int.go b/x/tx/signing/textual/int.go similarity index 100% rename from x/tx/textual/int.go rename to x/tx/signing/textual/int.go diff --git a/x/tx/textual/int_test.go b/x/tx/signing/textual/int_test.go similarity index 98% rename from x/tx/textual/int_test.go rename to x/tx/signing/textual/int_test.go index 5d9680b8c9..e67eb3b3bf 100644 --- a/x/tx/textual/int_test.go +++ b/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) { diff --git a/x/tx/textual/internal/cbor/cbor.go b/x/tx/signing/textual/internal/cbor/cbor.go similarity index 100% rename from x/tx/textual/internal/cbor/cbor.go rename to x/tx/signing/textual/internal/cbor/cbor.go diff --git a/x/tx/textual/internal/cbor/cbor_test.go b/x/tx/signing/textual/internal/cbor/cbor_test.go similarity index 98% rename from x/tx/textual/internal/cbor/cbor_test.go rename to x/tx/signing/textual/internal/cbor/cbor_test.go index a574f7f3cd..32dae48813 100644 --- a/x/tx/textual/internal/cbor/cbor_test.go +++ b/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" ) diff --git a/x/tx/textual/internal/testdata/README.md b/x/tx/signing/textual/internal/testdata/README.md similarity index 100% rename from x/tx/textual/internal/testdata/README.md rename to x/tx/signing/textual/internal/testdata/README.md diff --git a/x/tx/textual/internal/testdata/any.json b/x/tx/signing/textual/internal/testdata/any.json similarity index 100% rename from x/tx/textual/internal/testdata/any.json rename to x/tx/signing/textual/internal/testdata/any.json diff --git a/x/tx/textual/internal/testdata/bytes.json b/x/tx/signing/textual/internal/testdata/bytes.json similarity index 100% rename from x/tx/textual/internal/testdata/bytes.json rename to x/tx/signing/textual/internal/testdata/bytes.json diff --git a/x/tx/textual/internal/testdata/coin.json b/x/tx/signing/textual/internal/testdata/coin.json similarity index 100% rename from x/tx/textual/internal/testdata/coin.json rename to x/tx/signing/textual/internal/testdata/coin.json diff --git a/x/tx/textual/internal/testdata/coins.json b/x/tx/signing/textual/internal/testdata/coins.json similarity index 100% rename from x/tx/textual/internal/testdata/coins.json rename to x/tx/signing/textual/internal/testdata/coins.json diff --git a/x/tx/textual/internal/testdata/decimals.json b/x/tx/signing/textual/internal/testdata/decimals.json similarity index 100% rename from x/tx/textual/internal/testdata/decimals.json rename to x/tx/signing/textual/internal/testdata/decimals.json diff --git a/x/tx/textual/internal/testdata/duration.json b/x/tx/signing/textual/internal/testdata/duration.json similarity index 100% rename from x/tx/textual/internal/testdata/duration.json rename to x/tx/signing/textual/internal/testdata/duration.json diff --git a/x/tx/textual/internal/testdata/e2e.json b/x/tx/signing/textual/internal/testdata/e2e.json similarity index 100% rename from x/tx/textual/internal/testdata/e2e.json rename to x/tx/signing/textual/internal/testdata/e2e.json diff --git a/x/tx/textual/internal/testdata/encode.json b/x/tx/signing/textual/internal/testdata/encode.json similarity index 100% rename from x/tx/textual/internal/testdata/encode.json rename to x/tx/signing/textual/internal/testdata/encode.json diff --git a/x/tx/textual/internal/testdata/enum.json b/x/tx/signing/textual/internal/testdata/enum.json similarity index 100% rename from x/tx/textual/internal/testdata/enum.json rename to x/tx/signing/textual/internal/testdata/enum.json diff --git a/x/tx/textual/internal/testdata/integers.json b/x/tx/signing/textual/internal/testdata/integers.json similarity index 100% rename from x/tx/textual/internal/testdata/integers.json rename to x/tx/signing/textual/internal/testdata/integers.json diff --git a/x/tx/textual/internal/testdata/message.json b/x/tx/signing/textual/internal/testdata/message.json similarity index 100% rename from x/tx/textual/internal/testdata/message.json rename to x/tx/signing/textual/internal/testdata/message.json diff --git a/x/tx/textual/internal/testdata/repeated.json b/x/tx/signing/textual/internal/testdata/repeated.json similarity index 100% rename from x/tx/textual/internal/testdata/repeated.json rename to x/tx/signing/textual/internal/testdata/repeated.json diff --git a/x/tx/textual/internal/testdata/string.json b/x/tx/signing/textual/internal/testdata/string.json similarity index 100% rename from x/tx/textual/internal/testdata/string.json rename to x/tx/signing/textual/internal/testdata/string.json diff --git a/x/tx/textual/internal/testdata/timestamp.json b/x/tx/signing/textual/internal/testdata/timestamp.json similarity index 100% rename from x/tx/textual/internal/testdata/timestamp.json rename to x/tx/signing/textual/internal/testdata/timestamp.json diff --git a/x/tx/textual/internal/testdata/tx.json b/x/tx/signing/textual/internal/testdata/tx.json similarity index 100% rename from x/tx/textual/internal/testdata/tx.json rename to x/tx/signing/textual/internal/testdata/tx.json diff --git a/x/tx/textual/internal/textualpb/Makefile b/x/tx/signing/textual/internal/textualpb/Makefile similarity index 100% rename from x/tx/textual/internal/textualpb/Makefile rename to x/tx/signing/textual/internal/textualpb/Makefile diff --git a/x/tx/textual/internal/textualpb/buf.gen.yaml b/x/tx/signing/textual/internal/textualpb/buf.gen.yaml similarity index 100% rename from x/tx/textual/internal/textualpb/buf.gen.yaml rename to x/tx/signing/textual/internal/textualpb/buf.gen.yaml diff --git a/x/tx/textual/internal/textualpb/buf.lock b/x/tx/signing/textual/internal/textualpb/buf.lock similarity index 100% rename from x/tx/textual/internal/textualpb/buf.lock rename to x/tx/signing/textual/internal/textualpb/buf.lock diff --git a/x/tx/textual/internal/textualpb/buf.yaml b/x/tx/signing/textual/internal/textualpb/buf.yaml similarity index 100% rename from x/tx/textual/internal/textualpb/buf.yaml rename to x/tx/signing/textual/internal/textualpb/buf.yaml diff --git a/x/tx/textual/internal/textualpb/doc.go b/x/tx/signing/textual/internal/textualpb/doc.go similarity index 100% rename from x/tx/textual/internal/textualpb/doc.go rename to x/tx/signing/textual/internal/textualpb/doc.go diff --git a/x/tx/textual/internal/textualpb/textual.proto b/x/tx/signing/textual/internal/textualpb/textual.proto similarity index 100% rename from x/tx/textual/internal/textualpb/textual.proto rename to x/tx/signing/textual/internal/textualpb/textual.proto diff --git a/x/tx/textual/internal/textualpb/textual.pulsar.go b/x/tx/signing/textual/internal/textualpb/textual.pulsar.go similarity index 100% rename from x/tx/textual/internal/textualpb/textual.pulsar.go rename to x/tx/signing/textual/internal/textualpb/textual.pulsar.go diff --git a/x/tx/textual/message.go b/x/tx/signing/textual/message.go similarity index 100% rename from x/tx/textual/message.go rename to x/tx/signing/textual/message.go diff --git a/x/tx/textual/message_test.go b/x/tx/signing/textual/message_test.go similarity index 97% rename from x/tx/textual/message_test.go rename to x/tx/signing/textual/message_test.go index d085eb2050..446a80b94b 100644 --- a/x/tx/textual/message_test.go +++ b/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) { diff --git a/x/tx/textual/protoreflect_list_test.go b/x/tx/signing/textual/protoreflect_list_test.go similarity index 100% rename from x/tx/textual/protoreflect_list_test.go rename to x/tx/signing/textual/protoreflect_list_test.go diff --git a/x/tx/textual/repeated_test.go b/x/tx/signing/textual/repeated_test.go similarity index 97% rename from x/tx/textual/repeated_test.go rename to x/tx/signing/textual/repeated_test.go index 221c86b657..50a66968c5 100644 --- a/x/tx/textual/repeated_test.go +++ b/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 { diff --git a/x/tx/textual/string.go b/x/tx/signing/textual/string.go similarity index 100% rename from x/tx/textual/string.go rename to x/tx/signing/textual/string.go diff --git a/x/tx/textual/string_test.go b/x/tx/signing/textual/string_test.go similarity index 97% rename from x/tx/textual/string_test.go rename to x/tx/signing/textual/string_test.go index 27ecbea5b2..142fae5c0d 100644 --- a/x/tx/textual/string_test.go +++ b/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" ) diff --git a/x/tx/textual/timestamp.go b/x/tx/signing/textual/timestamp.go similarity index 100% rename from x/tx/textual/timestamp.go rename to x/tx/signing/textual/timestamp.go diff --git a/x/tx/textual/timestamp_test.go b/x/tx/signing/textual/timestamp_test.go similarity index 98% rename from x/tx/textual/timestamp_test.go rename to x/tx/signing/textual/timestamp_test.go index 95e248d610..c700188dcc 100644 --- a/x/tx/textual/timestamp_test.go +++ b/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" diff --git a/x/tx/textual/tx.go b/x/tx/signing/textual/tx.go similarity index 99% rename from x/tx/textual/tx.go rename to x/tx/signing/textual/tx.go index 764ef13958..a0451e794b 100644 --- a/x/tx/textual/tx.go +++ b/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 ( diff --git a/x/tx/textual/tx_test.go b/x/tx/signing/textual/tx_test.go similarity index 97% rename from x/tx/textual/tx_test.go rename to x/tx/signing/textual/tx_test.go index 933429a785..60c1cad64a 100644 --- a/x/tx/textual/tx_test.go +++ b/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 diff --git a/x/tx/textual/types.go b/x/tx/signing/textual/types.go similarity index 100% rename from x/tx/textual/types.go rename to x/tx/signing/textual/types.go diff --git a/x/tx/textual/valuerenderer.go b/x/tx/signing/textual/valuerenderer.go similarity index 99% rename from x/tx/textual/valuerenderer.go rename to x/tx/signing/textual/valuerenderer.go index 9f9a254a36..11a3774158 100644 --- a/x/tx/textual/valuerenderer.go +++ b/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 diff --git a/x/tx/textual/valuerenderer_test.go b/x/tx/signing/textual/valuerenderer_test.go similarity index 98% rename from x/tx/textual/valuerenderer_test.go rename to x/tx/signing/textual/valuerenderer_test.go index df63bcb363..a9e22e6770 100644 --- a/x/tx/textual/valuerenderer_test.go +++ b/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) {