From 99f8ac11a6c774dc4f8d230243eb28efcc79ef50 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Thu, 10 Aug 2023 10:36:11 +0200 Subject: [PATCH 1/3] chore: retract v0.21.x line --- .mergify.yaml | 8 -------- README.md | 3 ++- go.mod | 7 ++++++- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.mergify.yaml b/.mergify.yaml index 77a8e06d6..288d8aba0 100644 --- a/.mergify.yaml +++ b/.mergify.yaml @@ -32,14 +32,6 @@ pull_request_rules: backport: branches: - release/v0.20.x - - name: backport patches to v0.21.x branch - conditions: - - base=master - - label=backport/v0.21.x - actions: - backport: - branches: - - release/v0.21.x - name: backport patches to v1.x branch conditions: - base=master diff --git a/README.md b/README.md index 4cfa36376..4408efaef 100644 --- a/README.md +++ b/README.md @@ -27,5 +27,6 @@ In Ethereum, the analog is [Patricia tries](http://en.wikipedia.org/wiki/Radix_t | -------------------------------------------------------------- | -------------------------------------------------------- | ---------------- | | [v0.19.x](https://github.com/cosmos/iavl/tree/release/v0.19.x) | [`tm-db`](https://github.com/tendermint/tm-db) | v0.45.x, v0.46.x | | [v0.20.x](https://github.com/cosmos/iavl/tree/release/v0.20.x) | [`cometbft-db`](https://github.com/cometbft/cometbft-db) | v0.47.x | -| [v0.21.x](https://github.com/cosmos/iavl/tree/release/v0.21.x) | [`cosmos-db`](https://github.com/cosmos/cosmos-db) | - | | [v1.x.x](https://github.com/cosmos/iavl/tree/release/v1.x.x) | [`cosmos-db`](https://github.com/cosmos/cosmos-db) | - | + +NOTE: In the past, a v0.21.x release was published, but never used in production. It was retracted to avoid confusion. diff --git a/go.mod b/go.mod index c5911f68f..3a53c1614 100644 --- a/go.mod +++ b/go.mod @@ -47,4 +47,9 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -retract v0.18.0 +retract ( + v0.18.0 + // This version is not used by the Cosmos SDK and adds a maintenance burden. + // Use v1.x.x instead. + [v0.21.0, v0.21.1, v0.21.2] +) From 1cc3f8bf98c18fd4a04f096b63730d681f58f81b Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Thu, 10 Aug 2023 10:39:09 +0200 Subject: [PATCH 2/3] typo --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 3a53c1614..bfb0733f4 100644 --- a/go.mod +++ b/go.mod @@ -51,5 +51,5 @@ retract ( v0.18.0 // This version is not used by the Cosmos SDK and adds a maintenance burden. // Use v1.x.x instead. - [v0.21.0, v0.21.1, v0.21.2] + [v0.21.0, v0.21.2] ) From 78d2744f1a09a47203c21fbdfd82a8c5e202ce73 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Thu, 10 Aug 2023 10:48:25 +0200 Subject: [PATCH 3/3] lint --- export_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/export_test.go b/export_test.go index 12deb780a..af25aa799 100644 --- a/export_test.go +++ b/export_test.go @@ -126,7 +126,7 @@ func setupExportTreeRandom(t *testing.T) *ImmutableTree { // setupExportTreeSized sets up a single-version tree with a given number // of randomly generated key/value pairs, useful for benchmarking. -func setupExportTreeSized(t require.TestingT, treeSize int) *ImmutableTree { //nolint:unparam +func setupExportTreeSized(t require.TestingT, treeSize int) *ImmutableTree { const ( randSeed = 49872768940 // For deterministic tests keySize = 16