Skip to content

Commit

Permalink
Merge branch 'main' into feat/refactor-testkit
Browse files Browse the repository at this point in the history
  • Loading branch information
rnbguy committed Mar 12, 2024
2 parents 74203fb + 04520a8 commit 1abf751
Show file tree
Hide file tree
Showing 147 changed files with 1,876 additions and 1,588 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- [ibc] Refactor client relevant APIs for improved modularity and allow
standalone ICS-02 integration
([\#1114](https://github.com/cosmos/ibc-rs/issues/1114))
2 changes: 2 additions & 0 deletions .changelog/unreleased/breaking-changes/1118-bump-msrv.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- [ibc] Increase minimum supported Rust version to 1.71.1
([\#1118](https://github.com/cosmos/ibc-rs/issues/1118))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- [ibc-client-tendermint-types] Check ics23 proof specs for empty depth range.
([\#1100](https://github.com/cosmos/ibc-rs/issues/1100))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- [types] Refactor `Default` implementations with concrete names
([\#1074](https://github.com/cosmos/ibc-rs/issues/1074))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- [ibc-primitives] Use `let-else` over `downcast!()` and remove `utils/macros`
module as a result ([\#1118](https://github.com/cosmos/ibc-rs/issues/1118))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- [ibc-core] Remove unnecessary shadowing with same value
([\#1120](https://github.com/cosmos/ibc-rs/issues/1120))
2 changes: 2 additions & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ on:
- ibc-clients/**
- ibc-primitives/**
- ibc-query/**
- ibc-testkit/**
- ibc-derive/**
push:
branches:
- main
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/cw-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ on:
pull_request:
paths:
- .github/workflows/cw-check.yml
- Cargo.toml
- Cargo.lock
- ci/cw-check/**
push:
tags:
Expand All @@ -22,7 +24,6 @@ on:
- ibc-data-types/**
- ibc-clients/**
- ibc-primitives/**
- ibc-query/**
- ibc-derive/**
jobs:
cw-check:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/no-std.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
- ibc-data-types/**
- ibc-clients/**
- ibc-primitives/**
- ibc-derive/**
push:
branches: main
paths:
Expand All @@ -27,6 +28,7 @@ on:
- ibc-data-types/**
- ibc-clients/**
- ibc-primitives/**
- ibc-derive/**
jobs:
check-no-std-panic-conflict:
name: Check no_std panic conflict
Expand Down
45 changes: 45 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,3 +157,48 @@ jobs:
with:
command: test
args: --no-default-features --no-fail-fast --no-run

test-msrv:
timeout-minutes: 30
env:
CARGO_MSRV_VERSION: 0.16.0-beta.20
MSRV: 1.71.1
strategy:
matrix:
param:
[
{ os: ubuntu-latest, system: unknown-linux-gnu },
{ os: macos-latest, system: apple-darwin },
]
runs-on: ${{ matrix.param.os }}
steps:
- uses: actions/checkout@v2

- name: Download cargo-msrv
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: foresterre/cargo-msrv
version: "tags/v${{ env.CARGO_MSRV_VERSION }}"
file: "cargo-msrv-x86_64-${{ matrix.param.system }}-v${{ env.CARGO_MSRV_VERSION }}.tgz"

- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ env.MSRV }}
override: true
- uses: Swatinem/rust-cache@v1

- name: Install cargo-msrv
run: |
tar -xzf "cargo-msrv-x86_64-${{ matrix.param.system }}-v${{ env.CARGO_MSRV_VERSION }}.tgz"
mv "cargo-msrv-x86_64-${{ matrix.param.system }}-v${{ env.CARGO_MSRV_VERSION }}/cargo-msrv" ~/.cargo/bin
cargo msrv --version
- name: Calculate MSRV
run: cargo msrv --output-format minimal --min 1.64.0

- name: Build with MSRV
uses: actions-rs/cargo@v1
with:
toolchain: ${{ env.MSRV }}
command: build
args: --all-features
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ exclude = [
version = "0.50.0"
license = "Apache-2.0"
edition = "2021"
rust-version = "1.64"
rust-version = "1.71.1"
readme = "README.md"
repository = "https://github.com/cosmos/ibc-rs"
authors = ["Informal Systems <hello@informal.systems>"]
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
[![Build Status][build-image]][build-link]
[![Code Coverage][codecov-image]][codecov-link]
[![Apache 2.0 Licensed][license-image]][license-link]
![Rust Stable][rustc-image]
![Rust 1.64+][rustc-version]
![Lines of Code][loc-image]
![Version][crates-io-version]
![Downloads][crates-io-downloads]
![Rust Stable][msrv-image]

</div>
</div>
Expand Down Expand Up @@ -94,11 +94,11 @@ specific language governing permissions and limitations under the License.
[build-link]: https://github.com/cosmos/ibc-rs/actions?query=workflow%3ARust
[codecov-image]: https://codecov.io/gh/cosmos/ibc-rs/branch/main/graph/badge.svg?token=wUm2aLCOu
[codecov-link]: https://codecov.io/gh/cosmos/ibc-rs
[loc-image]: https://tokei.rs/b1/github/cosmos/ibc-rs
[license-image]: https://img.shields.io/badge/license-Apache2.0-blue.svg
[license-image]: https://img.shields.io/crates/l/ibc
[license-link]: https://github.com/cosmos/ibc-rs/blob/main/LICENSE
[rustc-image]: https://img.shields.io/badge/rustc-stable-blue.svg
[rustc-version]: https://img.shields.io/badge/rustc-1.60+-blue.svg
[crates-io-version]: https://img.shields.io/crates/v/ibc.svg
[crates-io-downloads]: https://img.shields.io/crates/d/ibc.svg
[msrv-image]: https://img.shields.io/crates/msrv/ibc

[//]: # (general links)
[ibc]: https://github.com/cosmos/ibc
Expand Down
2 changes: 1 addition & 1 deletion ci/cw-check/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "nightly-2023-03-09"
channel = "nightly-2024-02-24"
targets = [
"wasm32-unknown-unknown",
]
1 change: 1 addition & 0 deletions ci/no-std-check/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions clippy.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ disallowed-types = [
disallowed-methods = [
"std::time::Duration::as_secs_f64",
]
msrv = "1.71.1"
2 changes: 1 addition & 1 deletion docs/architecture/adr-005-handlers-redesign.md
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ trait ValidationContext {
/// Function required by ICS 03. Returns the list of all possible versions that the connection
/// handshake protocol supports.
fn get_compatible_versions(&self) -> Vec<Version> {
get_compatible_versions()
ConnectionVersion::compatibles()
}

/// Function required by ICS 03. Returns one version out of the supplied list of versions, which the
Expand Down
Loading

0 comments on commit 1abf751

Please sign in to comment.