refactor: Move to x/tx package (#14634)

cosmos · Jan 17, 2023 · afdbc51 · afdbc51
1 parent 7b8ab8e
commit afdbc51
Show file tree

Hide file tree

Showing 72 changed files with 50 additions and 40 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -94,7 +94,7 @@ updates:
       - "A:automerge"
       - dependencies
   - package-ecosystem: gomod
-    directory: "/tx"
+    directory: "/x/tx"
     schedule:
       interval: weekly
     labels:

diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -39,6 +39,8 @@
   - x/consensus/**/*
 "C:x/circuit":
   - x/circuit/**/*
+"C:x/tx":
+  - x/tx/**/*
 "C:collections":
   - collections/**/*
 "C:Cosmovisor":

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -559,26 +559,26 @@ jobs:
   # NOTE: The following jobs are used to test the Cosmos SDK Go submodules present under x/{module}.
   # They run when there is a diff in their respective directories.
 
-  test-tx:
+  test-x-tx:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
           go-version: 1.19.4
           cache: true
-          cache-dependency-path: tx/go.sum
+          cache-dependency-path: x/tx/go.sum
       - uses: technote-space/get-diff-action@v6.1.2
         id: git_diff
         with:
           PATTERNS: |
-            tx/**/*.go
-            tx/go.mod
-            tx/go.sum
+            x/tx/**/*.go
+            x/tx/go.mod
+            x/tx/go.sum
       - name: tests
         if: env.GIT_DIFF
         run: |
-          cd tx
+          cd x/tx
           go test -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock rocksdb_build' ./...
       - name: sonarcloud
         if: ${{ env.GIT_DIFF && !github.event.pull_request.draft }}
@@ -587,7 +587,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         with:
-          projectBaseDir: tx/
+          projectBaseDir: x/tx/
 
   test-x-nft:
     runs-on: ubuntu-latest

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -157,6 +157,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### API Breaking Changes
 
+* (tx) [#14634](https://github.com/cosmos/cosmos-sdk/pull/14634) Move the `tx` go module to `x/tx`.
 * (snapshots) [#14597](https://github.com/cosmos/cosmos-sdk/pull/14597) Move `snapshots` to `store/snapshots`, rename and bump proto package to v1.
 * (crypto/keyring) [#14151](https://github.com/cosmos/cosmos-sdk/pull/14151) Move keys presentation from `crypto/keyring` to `client/keys`
 * (modules) [#13850](https://github.com/cosmos/cosmos-sdk/pull/13850) and [#14046](https://github.com/cosmos/cosmos-sdk/pull/14046) Remove gogoproto stringer annotations. This removes the custom `String()` methods on all types that were using the annotations.

diff --git a/x/tx/CHANGELOG.md b/x/tx/CHANGELOG.md
@@ -0,0 +1,7 @@
+# CHANGELOG
+
+## Unreleased
+
+### Features
+
+### Improvements
diff --git a/tx/go.mod → x/tx/go.mod b/tx/go.mod → x/tx/go.mod
@@ -1,4 +1,4 @@
-module cosmossdk.io/tx
+module cosmossdk.io/x/tx
 
 go 1.19
 

diff --git a/tx/go.sum → x/tx/go.sum b/tx/go.sum → x/tx/go.sum
diff --git a/tx/signing/sign_mode_handler.go → x/tx/signing/sign_mode_handler.go b/tx/signing/sign_mode_handler.go → x/tx/signing/sign_mode_handler.go
diff --git a/tx/sonar-project.properties → x/tx/sonar-project.properties b/tx/sonar-project.properties → x/tx/sonar-project.properties
@@ -1,7 +1,7 @@
 sonar.projectKey=cosmos-sdk-tx
 sonar.organization=cosmos
 
-sonar.projectName=Cosmos SDK - Tx
+sonar.projectName=Cosmos SDK - x/tx
 sonar.project.monorepo.enabled=true
 
 sonar.sources=.

diff --git a/tx/textual/any.go → x/tx/textual/any.go b/tx/textual/any.go → x/tx/textual/any.go
diff --git a/tx/textual/any_test.go → x/tx/textual/any_test.go b/tx/textual/any_test.go → x/tx/textual/any_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"cosmossdk.io/tx/textual"
+	"cosmossdk.io/x/tx/textual"
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/require"
 

diff --git a/tx/textual/bench_test.go → x/tx/textual/bench_test.go b/tx/textual/bench_test.go → x/tx/textual/bench_test.go
diff --git a/tx/textual/bytes.go → x/tx/textual/bytes.go b/tx/textual/bytes.go → x/tx/textual/bytes.go
diff --git a/tx/textual/bytes_test.go → x/tx/textual/bytes_test.go b/tx/textual/bytes_test.go → x/tx/textual/bytes_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"cosmossdk.io/tx/textual"
+	"cosmossdk.io/x/tx/textual"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/reflect/protoreflect"
 )

diff --git a/tx/textual/coin_test.go → x/tx/textual/coin_test.go b/tx/textual/coin_test.go → x/tx/textual/coin_test.go
@@ -12,7 +12,7 @@ import (
 
 	bankv1beta1 "cosmossdk.io/api/cosmos/bank/v1beta1"
 	basev1beta1 "cosmossdk.io/api/cosmos/base/v1beta1"
-	"cosmossdk.io/tx/textual"
+	"cosmossdk.io/x/tx/textual"
 )
 
 // mockCoinMetadataKey is used in the mock coin metadata querier.

diff --git a/tx/textual/coins.go → x/tx/textual/coins.go b/tx/textual/coins.go → x/tx/textual/coins.go
diff --git a/tx/textual/coins_test.go → x/tx/textual/coins_test.go b/tx/textual/coins_test.go → x/tx/textual/coins_test.go
@@ -9,7 +9,7 @@ import (
 	bankv1beta1 "cosmossdk.io/api/cosmos/bank/v1beta1"
 	basev1beta1 "cosmossdk.io/api/cosmos/base/v1beta1"
 	"cosmossdk.io/math"
-	"cosmossdk.io/tx/textual"
+	"cosmossdk.io/x/tx/textual"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/reflect/protoreflect"
 )

diff --git a/tx/textual/dec.go → x/tx/textual/dec.go b/tx/textual/dec.go → x/tx/textual/dec.go
diff --git a/tx/textual/dec_test.go → x/tx/textual/dec_test.go b/tx/textual/dec_test.go → x/tx/textual/dec_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"cosmossdk.io/tx/textual"
+	"cosmossdk.io/x/tx/textual"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/reflect/protoreflect"
 )

diff --git a/tx/textual/duration.go → x/tx/textual/duration.go b/tx/textual/duration.go → x/tx/textual/duration.go
diff --git a/tx/textual/duration_test.go → x/tx/textual/duration_test.go b/tx/textual/duration_test.go → x/tx/textual/duration_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"cosmossdk.io/tx/textual"
+	"cosmossdk.io/x/tx/textual"
 	"github.com/stretchr/testify/require"
 
 	"google.golang.org/protobuf/proto"

diff --git a/tx/textual/e2e_test.go → x/tx/textual/e2e_test.go b/tx/textual/e2e_test.go → x/tx/textual/e2e_test.go
@@ -16,8 +16,8 @@ import (
 	_ "cosmossdk.io/api/cosmos/crypto/multisig"
 	_ "cosmossdk.io/api/cosmos/crypto/secp256k1"
 	_ "cosmossdk.io/api/cosmos/gov/v1"
-	"cosmossdk.io/tx/textual"
-	"cosmossdk.io/tx/textual/internal/textualpb"
+	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/textual/internal/textualpb"
 )
 
 type e2eJsonTest struct {

diff --git a/tx/textual/encode.go → x/tx/textual/encode.go b/tx/textual/encode.go → x/tx/textual/encode.go
@@ -3,7 +3,7 @@ package textual
 import (
 	"io"
 
-	"cosmossdk.io/tx/textual/internal/cbor"
+	"cosmossdk.io/x/tx/textual/internal/cbor"
 )
 
 var (

diff --git a/tx/textual/encode_test.go → x/tx/textual/encode_test.go b/tx/textual/encode_test.go → x/tx/textual/encode_test.go
diff --git a/tx/textual/enum.go → x/tx/textual/enum.go b/tx/textual/enum.go → x/tx/textual/enum.go
diff --git a/tx/textual/enum_test.go → x/tx/textual/enum_test.go b/tx/textual/enum_test.go → x/tx/textual/enum_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"cosmossdk.io/tx/textual"
-	"cosmossdk.io/tx/textual/internal/testpb"
+	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/textual/internal/testpb"
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/encoding/protojson"

diff --git a/tx/textual/int.go → x/tx/textual/int.go b/tx/textual/int.go → x/tx/textual/int.go
diff --git a/tx/textual/int_test.go → x/tx/textual/int_test.go b/tx/textual/int_test.go → x/tx/textual/int_test.go
@@ -11,7 +11,7 @@ import (
 	"google.golang.org/protobuf/reflect/protoreflect"
 
 	"cosmossdk.io/math"
-	"cosmossdk.io/tx/textual"
+	"cosmossdk.io/x/tx/textual"
 )
 
 func TestIntJsonTestcases(t *testing.T) {

diff --git a/tx/textual/internal/cbor/cbor.go → x/tx/textual/internal/cbor/cbor.go b/tx/textual/internal/cbor/cbor.go → x/tx/textual/internal/cbor/cbor.go
diff --git a/tx/textual/internal/cbor/cbor_test.go → x/tx/textual/internal/cbor/cbor_test.go b/tx/textual/internal/cbor/cbor_test.go → x/tx/textual/internal/cbor/cbor_test.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"testing"
 
-	"cosmossdk.io/tx/textual/internal/cbor"
+	"cosmossdk.io/x/tx/textual/internal/cbor"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/tx/textual/internal/testdata/README.md → x/tx/textual/internal/testdata/README.md b/tx/textual/internal/testdata/README.md → x/tx/textual/internal/testdata/README.md
diff --git a/tx/textual/internal/testdata/any.json → x/tx/textual/internal/testdata/any.json b/tx/textual/internal/testdata/any.json → x/tx/textual/internal/testdata/any.json
diff --git a/tx/textual/internal/testdata/bytes.json → x/tx/textual/internal/testdata/bytes.json b/tx/textual/internal/testdata/bytes.json → x/tx/textual/internal/testdata/bytes.json
diff --git a/tx/textual/internal/testdata/coin.json → x/tx/textual/internal/testdata/coin.json b/tx/textual/internal/testdata/coin.json → x/tx/textual/internal/testdata/coin.json
diff --git a/tx/textual/internal/testdata/coins.json → x/tx/textual/internal/testdata/coins.json b/tx/textual/internal/testdata/coins.json → x/tx/textual/internal/testdata/coins.json
diff --git a/tx/textual/internal/testdata/decimals.json → x/tx/textual/internal/testdata/decimals.json b/tx/textual/internal/testdata/decimals.json → x/tx/textual/internal/testdata/decimals.json
diff --git a/tx/textual/internal/testdata/duration.json → x/tx/textual/internal/testdata/duration.json b/tx/textual/internal/testdata/duration.json → x/tx/textual/internal/testdata/duration.json
diff --git a/tx/textual/internal/testdata/e2e.json → x/tx/textual/internal/testdata/e2e.json b/tx/textual/internal/testdata/e2e.json → x/tx/textual/internal/testdata/e2e.json
diff --git a/tx/textual/internal/testdata/encode.json → x/tx/textual/internal/testdata/encode.json b/tx/textual/internal/testdata/encode.json → x/tx/textual/internal/testdata/encode.json
diff --git a/tx/textual/internal/testdata/enum.json → x/tx/textual/internal/testdata/enum.json b/tx/textual/internal/testdata/enum.json → x/tx/textual/internal/testdata/enum.json
diff --git a/tx/textual/internal/testdata/integers.json → x/tx/textual/internal/testdata/integers.json b/tx/textual/internal/testdata/integers.json → x/tx/textual/internal/testdata/integers.json
diff --git a/tx/textual/internal/testdata/message.json → x/tx/textual/internal/testdata/message.json b/tx/textual/internal/testdata/message.json → x/tx/textual/internal/testdata/message.json
diff --git a/tx/textual/internal/testdata/repeated.json → x/tx/textual/internal/testdata/repeated.json b/tx/textual/internal/testdata/repeated.json → x/tx/textual/internal/testdata/repeated.json
diff --git a/tx/textual/internal/testdata/string.json → x/tx/textual/internal/testdata/string.json b/tx/textual/internal/testdata/string.json → x/tx/textual/internal/testdata/string.json
diff --git a/tx/textual/internal/testdata/timestamp.json → .../textual/internal/testdata/timestamp.json b/tx/textual/internal/testdata/timestamp.json → .../textual/internal/testdata/timestamp.json
diff --git a/tx/textual/internal/testdata/tx.json → x/tx/textual/internal/testdata/tx.json b/tx/textual/internal/testdata/tx.json → x/tx/textual/internal/testdata/tx.json
diff --git a/tx/textual/internal/testpb/1.proto → x/tx/textual/internal/testpb/1.proto b/tx/textual/internal/testpb/1.proto → x/tx/textual/internal/testpb/1.proto
@@ -7,7 +7,7 @@ import "google/protobuf/descriptor.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "cosmossdk.io/tx/textual/internal/testpb";
+option go_package = "cosmossdk.io/x/tx/textual/internal/testpb";
 
 // A is used for testing value renderers.
 message A {

diff --git a/tx/textual/internal/testpb/1.pulsar.go → x/tx/textual/internal/testpb/1.pulsar.go b/tx/textual/internal/testpb/1.pulsar.go → x/tx/textual/internal/testpb/1.pulsar.go
diff --git a/tx/textual/internal/testpb/Makefile → x/tx/textual/internal/testpb/Makefile b/tx/textual/internal/testpb/Makefile → x/tx/textual/internal/testpb/Makefile
diff --git a/tx/textual/internal/testpb/buf.gen.yaml → x/tx/textual/internal/testpb/buf.gen.yaml b/tx/textual/internal/testpb/buf.gen.yaml → x/tx/textual/internal/testpb/buf.gen.yaml
@@ -2,7 +2,7 @@ version: v1
 managed:
   enabled: true
   go_package_prefix:
-    default: cosmossdk.io/tx/textual/internal/testpb
+    default: cosmossdk.io/x/tx/textual/internal/testpb
     except:
       - buf.build/googleapis/googleapis
       - buf.build/cosmos/gogo-proto

diff --git a/tx/textual/internal/testpb/buf.lock → x/tx/textual/internal/testpb/buf.lock b/tx/textual/internal/testpb/buf.lock → x/tx/textual/internal/testpb/buf.lock
diff --git a/tx/textual/internal/testpb/buf.yaml → x/tx/textual/internal/testpb/buf.yaml b/tx/textual/internal/testpb/buf.yaml → x/tx/textual/internal/testpb/buf.yaml
diff --git a/tx/textual/internal/textualpb/Makefile → x/tx/textual/internal/textualpb/Makefile b/tx/textual/internal/textualpb/Makefile → x/tx/textual/internal/textualpb/Makefile
diff --git a/tx/textual/internal/textualpb/buf.gen.yaml → x/tx/textual/internal/textualpb/buf.gen.yaml b/tx/textual/internal/textualpb/buf.gen.yaml → x/tx/textual/internal/textualpb/buf.gen.yaml
@@ -2,7 +2,7 @@ version: v1
 managed:
   enabled: true
   go_package_prefix:
-    default: cosmossdk.io/tx/textual/internal/textualpb
+    default: cosmossdk.io/x/tx/textual/internal/textualpb
     except:
       - buf.build/googleapis/googleapis
       - buf.build/cosmos/gogo-proto

diff --git a/tx/textual/internal/textualpb/buf.lock → x/tx/textual/internal/textualpb/buf.lock b/tx/textual/internal/textualpb/buf.lock → x/tx/textual/internal/textualpb/buf.lock
diff --git a/tx/textual/internal/textualpb/buf.yaml → x/tx/textual/internal/textualpb/buf.yaml b/tx/textual/internal/textualpb/buf.yaml → x/tx/textual/internal/textualpb/buf.yaml
diff --git a/tx/textual/internal/textualpb/doc.go → x/tx/textual/internal/textualpb/doc.go b/tx/textual/internal/textualpb/doc.go → x/tx/textual/internal/textualpb/doc.go
diff --git a/tx/textual/internal/textualpb/textual.proto → .../textual/internal/textualpb/textual.proto b/tx/textual/internal/textualpb/textual.proto → .../textual/internal/textualpb/textual.proto
diff --git a/...tual/internal/textualpb/textual.pulsar.go → ...tual/internal/textualpb/textual.pulsar.go b/...tual/internal/textualpb/textual.pulsar.go → ...tual/internal/textualpb/textual.pulsar.go
diff --git a/tx/textual/message.go → x/tx/textual/message.go b/tx/textual/message.go → x/tx/textual/message.go
diff --git a/tx/textual/message_test.go → x/tx/textual/message_test.go b/tx/textual/message_test.go → x/tx/textual/message_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	bankv1beta1 "cosmossdk.io/api/cosmos/bank/v1beta1"
-	"cosmossdk.io/tx/textual"
-	"cosmossdk.io/tx/textual/internal/testpb"
+	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/textual/internal/testpb"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 )

diff --git a/tx/textual/protoreflect_list_test.go → x/tx/textual/protoreflect_list_test.go b/tx/textual/protoreflect_list_test.go → x/tx/textual/protoreflect_list_test.go
diff --git a/tx/textual/repeated_test.go → x/tx/textual/repeated_test.go b/tx/textual/repeated_test.go → x/tx/textual/repeated_test.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"cosmossdk.io/tx/textual"
-	"cosmossdk.io/tx/textual/internal/testpb"
+	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/textual/internal/testpb"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 )

diff --git a/tx/textual/string.go → x/tx/textual/string.go b/tx/textual/string.go → x/tx/textual/string.go
diff --git a/tx/textual/string_test.go → x/tx/textual/string_test.go b/tx/textual/string_test.go → x/tx/textual/string_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"cosmossdk.io/tx/textual"
+	"cosmossdk.io/x/tx/textual"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/reflect/protoreflect"
 )

diff --git a/tx/textual/timestamp.go → x/tx/textual/timestamp.go b/tx/textual/timestamp.go → x/tx/textual/timestamp.go
diff --git a/tx/textual/timestamp_test.go → x/tx/textual/timestamp_test.go b/tx/textual/timestamp_test.go → x/tx/textual/timestamp_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"cosmossdk.io/tx/textual"
+	"cosmossdk.io/x/tx/textual"
 	"github.com/stretchr/testify/require"
 
 	"google.golang.org/protobuf/proto"

diff --git a/tx/textual/tx.go → x/tx/textual/tx.go b/tx/textual/tx.go → x/tx/textual/tx.go
@@ -17,7 +17,7 @@ import (
 	msg "cosmossdk.io/api/cosmos/msg/v1"
 	signingv1beta1 "cosmossdk.io/api/cosmos/tx/signing/v1beta1"
 	txv1beta1 "cosmossdk.io/api/cosmos/tx/v1beta1"
-	"cosmossdk.io/tx/textual/internal/textualpb"
+	"cosmossdk.io/x/tx/textual/internal/textualpb"
 )
 
 var (

diff --git a/tx/textual/tx_test.go → x/tx/textual/tx_test.go b/tx/textual/tx_test.go → x/tx/textual/tx_test.go
@@ -20,9 +20,9 @@ import (
 	_ "cosmossdk.io/api/cosmos/crypto/secp256k1"
 	_ "cosmossdk.io/api/cosmos/gov/v1"
 	txv1beta1 "cosmossdk.io/api/cosmos/tx/v1beta1"
-	"cosmossdk.io/tx/signing"
-	"cosmossdk.io/tx/textual"
-	"cosmossdk.io/tx/textual/internal/textualpb"
+	"cosmossdk.io/x/tx/signing"
+	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/textual/internal/textualpb"
 )
 
 // txJsonTestTx represents the type that in the JSON test

diff --git a/tx/textual/types.go → x/tx/textual/types.go b/tx/textual/types.go → x/tx/textual/types.go
diff --git a/tx/textual/valuerenderer.go → x/tx/textual/valuerenderer.go b/tx/textual/valuerenderer.go → x/tx/textual/valuerenderer.go
@@ -13,8 +13,8 @@ import (
 
 	bankv1beta1 "cosmossdk.io/api/cosmos/bank/v1beta1"
 	basev1beta1 "cosmossdk.io/api/cosmos/base/v1beta1"
-	"cosmossdk.io/tx/signing"
-	"cosmossdk.io/tx/textual/internal/textualpb"
+	"cosmossdk.io/x/tx/signing"
+	"cosmossdk.io/x/tx/textual/internal/textualpb"
 	cosmos_proto "github.com/cosmos/cosmos-proto"
 )
 

diff --git a/tx/textual/valuerenderer_test.go → x/tx/textual/valuerenderer_test.go b/tx/textual/valuerenderer_test.go → x/tx/textual/valuerenderer_test.go
@@ -7,8 +7,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/reflect/protoreflect"
 
-	"cosmossdk.io/tx/textual"
-	"cosmossdk.io/tx/textual/internal/testpb"
+	"cosmossdk.io/x/tx/textual"
+	"cosmossdk.io/x/tx/textual/internal/testpb"
 )
 
 func TestDispatcher(t *testing.T) {