From 47367090a45484107523a0093f64a2a86027e2dc Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Mon, 27 Jan 2025 15:36:03 +0100 Subject: [PATCH 1/2] chore(collections): bring in `protocodec` in collections directly --- .github/dependabot.yml | 9 ------ .github/pr_labeler.yml | 2 -- .github/workflows/test.yml | 23 --------------- collections/go.mod | 2 +- collections/protocodec/CHANGELOG.md | 36 ------------------------ collections/protocodec/go.mod | 23 --------------- collections/protocodec/go.sum | 43 ----------------------------- go.work.example | 1 - 8 files changed, 1 insertion(+), 138 deletions(-) delete mode 100644 collections/protocodec/CHANGELOG.md delete mode 100644 collections/protocodec/go.mod delete mode 100644 collections/protocodec/go.sum diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 68919c4fd69d..09a871561be7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -178,15 +178,6 @@ updates: labels: - "A:automerge" - dependencies - - package-ecosystem: gomod - directory: "/collections/protocodec" - schedule: - interval: weekly - day: friday - time: "02:20" - labels: - - "A:automerge" - - dependencies - package-ecosystem: gomod directory: "x/accounts" schedule: diff --git a/.github/pr_labeler.yml b/.github/pr_labeler.yml index 472d84033c0d..aaa75f314165 100644 --- a/.github/pr_labeler.yml +++ b/.github/pr_labeler.yml @@ -19,8 +19,6 @@ - store/**/* "C:collections": - collections/**/* -"C:collections/protocodec": - - collections/protocodec/* "C:core/testing": - core/testing/**/* "C:log": diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d48d38bebffa..db78ba202095 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -537,29 +537,6 @@ jobs: with: projectBaseDir: collections/ - test-collections-protocodec: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version: "1.23" - check-latest: true - cache: true - cache-dependency-path: collections/protocodec/go.sum - - uses: technote-space/get-diff-action@v6.1.2 - id: git_diff - with: - PATTERNS: | - collections/protocodec/**/*.go - collections/protocodec/go.mod - collections/protocodec/go.sum - - name: tests - if: env.GIT_DIFF - run: | - cd collections/protocodec - go test -mod=readonly -timeout 30m -coverprofile=coverage.out -covermode=atomic -tags='norace ledger test_ledger_mock' ./... - test-orm: runs-on: ubuntu-latest steps: diff --git a/collections/go.mod b/collections/go.mod index 129fc69daff0..cd6c34b7e143 100644 --- a/collections/go.mod +++ b/collections/go.mod @@ -7,6 +7,7 @@ require ( cosmossdk.io/core/testing v0.0.1 cosmossdk.io/schema v1.0.0 github.com/cosmos/gogoproto v1.7.0 + github.com/google/go-cmp v0.6.0 github.com/stretchr/testify v1.10.0 github.com/tidwall/btree v1.7.0 google.golang.org/protobuf v1.36.3 @@ -16,7 +17,6 @@ require ( require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/golang/protobuf v1.5.4 // indirect - github.com/google/go-cmp v0.6.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/collections/protocodec/CHANGELOG.md b/collections/protocodec/CHANGELOG.md deleted file mode 100644 index 4db1637cdf14..000000000000 --- a/collections/protocodec/CHANGELOG.md +++ /dev/null @@ -1,36 +0,0 @@ - - -# Changelog - -## [Unreleased] - -## [v0.0.1](https://github.com/cosmos/cosmos-sdk/releases/tag/collections/protocodec/v0.0.1) - -Initial tag. diff --git a/collections/protocodec/go.mod b/collections/protocodec/go.mod deleted file mode 100644 index 554906d12fa9..000000000000 --- a/collections/protocodec/go.mod +++ /dev/null @@ -1,23 +0,0 @@ -module cosmossdk.io/collections/protocodec - -go 1.23.2 - -require ( - cosmossdk.io/collections v1.0.0 - cosmossdk.io/core v1.0.0 - github.com/cosmos/gogoproto v1.7.0 - github.com/google/go-cmp v0.6.0 - github.com/stretchr/testify v1.10.0 - google.golang.org/protobuf v1.36.3 -) - -require ( - cosmossdk.io/schema v1.0.0 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/kr/pretty v0.3.1 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/rogpeppe/go-internal v1.13.1 // indirect - github.com/tidwall/btree v1.7.0 // indirect - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect -) diff --git a/collections/protocodec/go.sum b/collections/protocodec/go.sum deleted file mode 100644 index 55e9ad5f5ea1..000000000000 --- a/collections/protocodec/go.sum +++ /dev/null @@ -1,43 +0,0 @@ -cosmossdk.io/collections v1.0.0 h1:YCYIe/pIMtc1iLDD0OrVdfWCnIkpwdy7k9NSQpaR5mg= -cosmossdk.io/collections v1.0.0/go.mod h1:mFfLxnYT1fV+B3Lx9GLap1qxmffIPqQCND4xBExerps= -cosmossdk.io/core v1.0.0 h1:e7XBbISOytLBOXMVwpRPixThXqEkeLGlg8no/qpgS8U= -cosmossdk.io/core v1.0.0/go.mod h1:mKIp3RkoEmtqdEdFHxHwWAULRe+79gfdOvmArrLDbDc= -cosmossdk.io/core/testing v0.0.1 h1:gYCTaftcRrz+HoNXmK7r9KgbG1jgBJ8pNzm/Pa/erFQ= -cosmossdk.io/core/testing v0.0.1/go.mod h1:2VDNz/25qtxgPa0+j8LW5e8Ev/xObqoJA7QuJS9/wIQ= -cosmossdk.io/schema v1.0.0 h1:/diH4XJjpV1JQwuIozwr+A4uFuuwanFdnw2kKeiXwwQ= -cosmossdk.io/schema v1.0.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ= -github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fro= -github.com/cosmos/gogoproto v1.7.0/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= -github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= -github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= -github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= -github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= -github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI= -github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= -google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= -google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw= -pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= diff --git a/go.work.example b/go.work.example index 87d19b22f66a..d974467b02a4 100644 --- a/go.work.example +++ b/go.work.example @@ -5,7 +5,6 @@ use ( ./api ./client/v2 ./collections - ./collections/protocodec ./core ./core/testing ./depinject From 4dbed6cc88bac3e10de95fe7e3cd695c7bd7c842 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Mon, 27 Jan 2025 15:38:57 +0100 Subject: [PATCH 2/2] cl --- collections/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/collections/CHANGELOG.md b/collections/CHANGELOG.md index b58e3190a56b..6b850be66e48 100644 --- a/collections/CHANGELOG.md +++ b/collections/CHANGELOG.md @@ -31,6 +31,12 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## [Unreleased] +## [v1.1.0](https://github.com/cosmos/cosmos-sdk/releases/tag/collections%2Fv1.1.0) + +### Improvements + +* [#23515](https://github.com/cosmos/cosmos-sdk/pull/23515) Bring in `collections/protocodec` go module as package within `collections` module. + ## [v1.0.0](https://github.com/cosmos/cosmos-sdk/releases/tag/collections%2Fv1.0.0) ### Features