Remove cosmwasm-storage

.circleci/config.yml

@@ -52,7 +52,6 @@ workflows:
       - package_schema
       - package_schema_derive
       - package_std
-      - package_storage
       - package_vm
       - package_vm_windows
       - contract_burner
@@ -373,37 +372,6 @@ jobs:
             - target/debug/deps
           key: cargocache-v2-package_std-rust:1.70.0-{{ checksum "Cargo.lock" }}
 
-  package_storage:
-    docker:
-      - image: rust:1.70.0
-    steps:
-      - checkout
-      - run:
-          name: Version information
-          command: rustc --version; cargo --version; rustup --version; rustup target list --installed
-      - restore_cache:
-          keys:
-            - cargocache-v2-package_storage-rust:1.70.0-{{ checksum "Cargo.lock" }}
-      - run:
-          name: Build library for native target
-          working_directory: ~/project/packages/storage
-          command: cargo build --locked
-      - run:
-          name: Run unit tests
-          working_directory: ~/project/packages/storage
-          command: cargo test --locked
-      - run:
-          name: Run unit tests (with iterator support)
-          working_directory: ~/project/packages/storage
-          command: cargo test --locked --features iterator
-      - save_cache:
-          paths:
-            - /usr/local/cargo/registry
-            - target/debug/.fingerprint
-            - target/debug/build
-            - target/debug/deps
-          key: cargocache-v2-package_storage-rust:1.70.0-{{ checksum "Cargo.lock" }}
-
   package_vm:
     docker:
       - image: rust:1.70.0
@@ -908,14 +876,6 @@ jobs:
           name: Clippy linting on std (all feature flags)
           working_directory: ~/project/packages/std
           command: cargo clippy --all-targets --features abort,iterator,staking,stargate,cosmwasm_1_4 -- -D warnings
-      - run:
-          name: Clippy linting on storage (no feature flags)
-          working_directory: ~/project/packages/storage
-          command: cargo clippy --all-targets -- -D warnings
-      - run:
-          name: Clippy linting on storage (all feature flags)
-          working_directory: ~/project/packages/storage
-          command: cargo clippy --all-targets --features iterator -- -D warnings
       - run:
           name: Clippy linting on vm (no feature flags)
           working_directory: ~/project/packages/vm
@@ -986,7 +946,6 @@ jobs:
             grcov . -s packages/derive --binary-path ./target/debug -t lcov -o ./reports/derive.info
             grcov . -s packages/schema --binary-path ./target/debug -t lcov -o ./reports/schema.info
             grcov . -s packages/std --binary-path ./target/debug -t lcov -o ./reports/std.info
-            grcov . -s packages/storage --binary-path ./target/debug -t lcov -o ./reports/storage.info
             grcov . -s packages/vm --binary-path ./target/debug -t lcov -o ./reports/vm.info
           environment:
             RUSTFLAGS: "-Cinstrument-coverage"
@@ -1003,9 +962,6 @@ jobs:
       - codecov/upload:
           file: reports/std.info
           flags: cosmwasm-std
-      - codecov/upload:
-          file: reports/storage.info
-          flags: cosmwasm-storage
       - codecov/upload:
           file: reports/vm.info
           flags: cosmwasm-vm

.mergify.yml

@@ -36,7 +36,6 @@ pull_request_rules:
       - "status-success=ci/circleci: package_schema"
       - "status-success=ci/circleci: package_schema_derive"
       - "status-success=ci/circleci: package_std"
-      - "status-success=ci/circleci: package_storage"
       - "status-success=ci/circleci: package_vm"
       - "status-success=ci/circleci: package_vm_windows"
     actions:

CHANGELOG.md

@@ -6,41 +6,52 @@ and this project adheres to
 
 ## [Unreleased]
 
+### Added
+
+- cosmwasm-std: Add `SubMsg:reply_never` constructor ([#1929])
+- cosmwasm-std: Add optional memo field to `IbcMsg::Transfer`. ([#1878])
+
+[#1878]: https://github.com/CosmWasm/cosmwasm/pull/1878
+[#1929]: https://github.com/CosmWasm/cosmwasm/pull/1929
+
 ### Changed
 
 - cosmwasm-std: Replace `ContractInfoResponse::new` with new (unstable)
   constructor, remove `SubMsgExecutionResponse` (Use `SubMsgResponse` instead)
   and remove `PartialEq<&str> for Addr` (validate the address and use
   `PartialEq<Addr> for Addr` instead). ([#1879])
-- cosmwasm-std: Remove `Mul<Decimal> for Uint128` and
-  `Mul<Decimal256> for Uint256`. Use `Uint{128,256}::mul_floor` instead.
-  ([#1890])
 - cosmwasm-std: `Uint{64,128}::full_mul` now take `Into<Self>` as an argument.
   ([#1874])
 - cosmwasm-vm: Make `CacheOptions` non-exhaustive and add a constructor.
   ([#1898])
 - cosmwasm-std: `Coin::new` now takes `Into<Uint128>` instead of `u128` as the
   first argument and `DecCoin::new` takes `Into<Decimal256>` instead of
   `Decimal256`. ([#1902])
-- cosmwasm-std: Remove operand strings from `OverflowError`,
-  `ConversionOverflowError` and `DivideByZeroError`. ([#1896])
-- cosmwasm-std: Add `SubMsg:reply_never` constructor ([#1929])
-- cosmwasm-std: Add optional memo field to `IbcMsg::Transfer`. ([#1878])
 - cosmwasm-std: Make inner values of `CanonicalAddr` and `Binary` private and
   add constructor for `Binary`. ([#1876])
 - cosmwasm-vm: Make inner value of `Size` private and add constructor. ([#1876])
-- cosmwasm-std: Remove old IBC version and make v3 the default. ([#1875])
 
 [#1874]: https://github.com/CosmWasm/cosmwasm/pull/1874
-[#1875]: https://github.com/CosmWasm/cosmwasm/pull/1875
 [#1876]: https://github.com/CosmWasm/cosmwasm/pull/1876
-[#1878]: https://github.com/CosmWasm/cosmwasm/pull/1878
 [#1879]: https://github.com/CosmWasm/cosmwasm/pull/1879
-[#1890]: https://github.com/CosmWasm/cosmwasm/pull/1890
-[#1896]: https://github.com/CosmWasm/cosmwasm/pull/1896
 [#1898]: https://github.com/CosmWasm/cosmwasm/pull/1898
 [#1902]: https://github.com/CosmWasm/cosmwasm/pull/1902
-[#1929]: https://github.com/CosmWasm/cosmwasm/pull/1929
+
+### Removed
+
+- cosmwasm-std: Remove `Mul<Decimal> for Uint128` and
+  `Mul<Decimal256> for Uint256`. Use `Uint{128,256}::mul_floor` instead.
+  ([#1890])
+- cosmwasm-std: Remove operand strings from `OverflowError`,
+  `ConversionOverflowError` and `DivideByZeroError`. ([#1896])
+- cosmwasm-std: Remove old IBC version and make v3 the default. ([#1875])
+- cosmwasm-storage: Removed, use [cw-storage-plus] instead. ([#1936])
+
+[cw-storage-plus]: https://github.com/CosmWasm/cw-storage-plus
+[#1875]: https://github.com/CosmWasm/cosmwasm/pull/1875
+[#1890]: https://github.com/CosmWasm/cosmwasm/pull/1890
+[#1896]: https://github.com/CosmWasm/cosmwasm/pull/1896
+[#1936]: https://github.com/CosmWasm/cosmwasm/pull/1936
 
 ## [1.5.0] - 2023-10-31
 

README.md

@@ -8,15 +8,18 @@
 
 The following packages are maintained here:
 
-| Crate            | Usage                | Download                                                                                                                            | Docs                                                                                    | Coverage                                           |
-| ---------------- | -------------------- | ----------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | -------------------------------------------------- |
-| cosmwasm-crypto  | Internal only        | [![cosmwasm-crypto on crates.io](https://img.shields.io/crates/v/cosmwasm-crypto.svg)](https://crates.io/crates/cosmwasm-crypto)    | [![Docs](https://docs.rs/cosmwasm-crypto/badge.svg)](https://docs.rs/cosmwasm-crypto)   | [![Coverage][cov-badge-crypto]][cov-link-crypto]   |
-| cosmwasm-derive  | Internal only        | [![cosmwasm-derive on crates.io](https://img.shields.io/crates/v/cosmwasm-derive.svg)](https://crates.io/crates/cosmwasm-derive)    | [![Docs](https://docs.rs/cosmwasm-derive/badge.svg)](https://docs.rs/cosmwasm-derive)   | [![Coverage][cov-badge-derive]][cov-link-derive]   |
-| cosmwasm-schema  | Contract development | [![cosmwasm-schema on crates.io](https://img.shields.io/crates/v/cosmwasm-schema.svg)](https://crates.io/crates/cosmwasm-schema)    | [![Docs](https://docs.rs/cosmwasm-schema/badge.svg)](https://docs.rs/cosmwasm-schema)   | [![Coverage][cov-badge-schema]][cov-link-schema]   |
-| cosmwasm-std     | Contract development | [![cosmwasm-std on crates.io](https://img.shields.io/crates/v/cosmwasm-std.svg)](https://crates.io/crates/cosmwasm-std)             | [![Docs](https://docs.rs/cosmwasm-std/badge.svg)](https://docs.rs/cosmwasm-std)         | [![Coverage][cov-badge-std]][cov-link-std]         |
-| cosmwasm-storage | Contract development | [![cosmwasm-storage on crates.io](https://img.shields.io/crates/v/cosmwasm-storage.svg)](https://crates.io/crates/cosmwasm-storage) | [![Docs](https://docs.rs/cosmwasm-storage/badge.svg)](https://docs.rs/cosmwasm-storage) | [![Coverage][cov-badge-storage]][cov-link-storage] |
-| cosmwasm-vm      | Host environments    | [![cosmwasm-vm on crates.io](https://img.shields.io/crates/v/cosmwasm-vm.svg)](https://crates.io/crates/cosmwasm-vm)                | [![Docs](https://docs.rs/cosmwasm-vm/badge.svg)](https://docs.rs/cosmwasm-vm)           | ([#1151])                                          |
-| cosmwasm-check   | Contract development | [![cosmwasm-check on crates.io](https://img.shields.io/crates/v/cosmwasm-check.svg)](https://crates.io/crates/cosmwasm-check)       | `cosmwasm-check -h`                                                                     | N/A                                                |
+| Crate           | Usage                | Download                                                                                                                         | Docs                                                                                  | Coverage                                         |
+| --------------- | -------------------- | -------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- | ------------------------------------------------ |
+| cosmwasm-crypto | Internal only        | [![cosmwasm-crypto on crates.io](https://img.shields.io/crates/v/cosmwasm-crypto.svg)](https://crates.io/crates/cosmwasm-crypto) | [![Docs](https://docs.rs/cosmwasm-crypto/badge.svg)](https://docs.rs/cosmwasm-crypto) | [![Coverage][cov-badge-crypto]][cov-link-crypto] |
+| cosmwasm-derive | Internal only        | [![cosmwasm-derive on crates.io](https://img.shields.io/crates/v/cosmwasm-derive.svg)](https://crates.io/crates/cosmwasm-derive) | [![Docs](https://docs.rs/cosmwasm-derive/badge.svg)](https://docs.rs/cosmwasm-derive) | [![Coverage][cov-badge-derive]][cov-link-derive] |
+| cosmwasm-schema | Contract development | [![cosmwasm-schema on crates.io](https://img.shields.io/crates/v/cosmwasm-schema.svg)](https://crates.io/crates/cosmwasm-schema) | [![Docs](https://docs.rs/cosmwasm-schema/badge.svg)](https://docs.rs/cosmwasm-schema) | [![Coverage][cov-badge-schema]][cov-link-schema] |
+| cosmwasm-std    | Contract development | [![cosmwasm-std on crates.io](https://img.shields.io/crates/v/cosmwasm-std.svg)](https://crates.io/crates/cosmwasm-std)          | [![Docs](https://docs.rs/cosmwasm-std/badge.svg)](https://docs.rs/cosmwasm-std)       | [![Coverage][cov-badge-std]][cov-link-std]       |
+| cosmwasm-vm     | Host environments    | [![cosmwasm-vm on crates.io](https://img.shields.io/crates/v/cosmwasm-vm.svg)](https://crates.io/crates/cosmwasm-vm)             | [![Docs](https://docs.rs/cosmwasm-vm/badge.svg)](https://docs.rs/cosmwasm-vm)         | [![Coverage][cov-badge-vm]][cov-link-vm]         |
+| cosmwasm-check  | Contract development | [![cosmwasm-check on crates.io](https://img.shields.io/crates/v/cosmwasm-check.svg)](https://crates.io/crates/cosmwasm-check)    | `cosmwasm-check -h`                                                                   | N/A                                              |
+
+[cosmwasm-storage](https://crates.io/crates/cosmwasm-storage) is no longer
+maintained and has been dropped in favor of
+[cw-storage-plus](https://github.com/CosmWasm/cw-storage-plus).
 
 [cov-badge-crypto]:
   https://codecov.io/gh/CosmWasm/cosmwasm/branch/main/graph/badge.svg?flag=cosmwasm-crypto
@@ -26,18 +29,16 @@ The following packages are maintained here:
   https://codecov.io/gh/CosmWasm/cosmwasm/branch/main/graph/badge.svg?flag=cosmwasm-schema
 [cov-badge-std]:
   https://codecov.io/gh/CosmWasm/cosmwasm/branch/main/graph/badge.svg?flag=cosmwasm-std
-[cov-badge-storage]:
-  https://codecov.io/gh/CosmWasm/cosmwasm/branch/main/graph/badge.svg?flag=cosmwasm-storage
+[cov-badge-vm]:
+  https://codecov.io/gh/CosmWasm/cosmwasm/branch/main/graph/badge.svg?flag=cosmwasm-vm
 [cov-link-crypto]:
   https://codecov.io/gh/CosmWasm/cosmwasm/tree/main/packages/crypto
 [cov-link-derive]:
   https://codecov.io/gh/CosmWasm/cosmwasm/tree/main/packages/derive
 [cov-link-schema]:
   https://codecov.io/gh/CosmWasm/cosmwasm/tree/main/packages/schema
 [cov-link-std]: https://codecov.io/gh/CosmWasm/cosmwasm/tree/main/packages/std
-[cov-link-storage]:
-  https://codecov.io/gh/CosmWasm/cosmwasm/tree/main/packages/storage
-[#1151]: https://github.com/CosmWasm/cosmwasm/issues/1151
+[cov-link-vm]: https://codecov.io/gh/CosmWasm/cosmwasm/tree/main/packages/vm
 
 ## Overview
 
@@ -51,17 +52,10 @@ This code is compiled into Wasm bytecode as part of the smart contract.
 - [cosmwasm-std](https://github.com/CosmWasm/cosmwasm/tree/main/packages/std) -
   A crate in this workspace. Provides the bindings and all imports needed to
   build a smart contract.
-- [cosmwasm-storage](https://github.com/CosmWasm/cosmwasm/tree/main/packages/storage) -
-  A crate in this workspace. This optional addition to `cosmwasm-std` includes
-  convenience helpers for interacting with storage. **This is being deprecated
-  in favor of
-  [`cw-storage-plus`](https://github.com/CosmWasm/cw-storage-plus).** See
-  [issue #1457](https://github.com/CosmWasm/cosmwasm/issues/1457).
 - [cw-storage-plus](https://github.com/CosmWasm/cw-storage-plus) - A crate which
-  fills the same role as `cosmwasm-storage`, but with much more powerful types
+  provides convenience helpers for interacting with storage with powerful types
   supporting composite primary keys, secondary indexes, automatic snapshotting,
-  and more. This is used in most modern contracts and likely going to be
-  stabilized (version `1.0.0`) soon.
+  and more. This is used in most modern contracts.
 
 **Building contracts:**
 

codecov.yml

@@ -30,6 +30,3 @@ flags:
   cosmwasm-std:
     paths:
       - packages/std/
-  cosmwasm-storage:
-    paths:
-      - packages/storage/

devtools/check_workspace.sh

@@ -15,7 +15,6 @@ cargo fmt
   cargo wasm-debug --features iterator,staking,stargate
   cargo clippy --all-targets --features iterator,staking,stargate -- -D warnings
 )
-(cd packages/storage && cargo build && cargo clippy --all-targets --features iterator -- -D warnings)
 (cd packages/schema && cargo build && cargo clippy --all-targets -- -D warnings)
 (cd packages/schema-derive && cargo build && cargo clippy --all-targets -- -D warnings)
 (cd packages/vm && cargo build --features iterator,stargate && cargo clippy --all-targets --features iterator,stargate -- -D warnings)

devtools/clean.sh

@@ -4,6 +4,5 @@ command -v shellcheck >/dev/null && shellcheck "$0"
 
 (cd packages/std && cargo clean)
 (cd packages/crypto && cargo clean)
-(cd packages/storage && cargo clean)
 (cd packages/schema && cargo clean)
 (cd packages/vm && cargo clean)

devtools/deadlinks.py

@@ -72,7 +72,6 @@ def check_project(project):
     "cosmwasm_derive",
     "cosmwasm_schema",
     "cosmwasm_std",
-    "cosmwasm_storage",
     "cosmwasm_vm"
 ]
 

devtools/test_workspace.sh

@@ -5,7 +5,6 @@ command -v shellcheck >/dev/null && shellcheck "$0"
 cargo fmt
 (cd packages/crypto && cargo test)
 (cd packages/std && cargo test --features iterator,cosmwasm_1_2)
-(cd packages/storage && cargo test --features iterator)
 (cd packages/schema && cargo test)
 (cd packages/schema-derive && cargo test)
 (cd packages/vm && cargo test --features iterator,stargate)