Skip to content

Fix merge conflict #716

Fix merge conflict

Fix merge conflict #716

Triggered via push August 7, 2024 19:06
Status Failure
Total duration 52s
Artifacts

cw-check.yaml

on: push
Fit to window
Zoom out
Zoom in

Annotations

11 errors
the trait bound `specs::ProofSpecs: core::convert::TryFrom<std::vec::Vec<ics23::ProofSpec>>` is not satisfied: ibc-core/ics23-commitment/types/src/specs.rs#L23
error[E0277]: the trait bound `specs::ProofSpecs: core::convert::TryFrom<std::vec::Vec<ics23::ProofSpec>>` is not satisfied --> ibc-core/ics23-commitment/types/src/specs.rs:23:10 | 23 | .try_into() | ^^^^^^^^ the trait `core::convert::From<std::vec::Vec<ics23::ProofSpec>>` is not implemented for `specs::ProofSpecs`, which is required by `std::vec::Vec<ics23::ProofSpec>: core::convert::TryInto<_>` | = note: required for `std::vec::Vec<ics23::ProofSpec>` to implement `core::convert::Into<specs::ProofSpecs>` = note: required for `specs::ProofSpecs` to implement `core::convert::TryFrom<std::vec::Vec<ics23::ProofSpec>>` = note: required for `std::vec::Vec<ics23::ProofSpec>` to implement `core::convert::TryInto<specs::ProofSpecs>`
mismatched types: ibc-core/ics23-commitment/types/src/merkle.rs#L192
error[E0308]: mismatched types --> ibc-core/ics23-commitment/types/src/merkle.rs:192:55 | 192 | if !verify_non_membership::<H>(proof, spec, &subroot, key.as_ref()) { | -------------------------- ^^^^ expected `ibc_proto::ics23::ProofSpec`, found `ics23::ProofSpec` | | | arguments to this function are incorrect | = note: `ics23::ProofSpec` and `ibc_proto::ics23::ProofSpec` have similar names, but are actually distinct types note: `ics23::ProofSpec` is defined in crate `ics23` --> /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/ics23-0.11.3/src/cosmos.ics23.v1.rs:141:1 | 141 | pub struct ProofSpec { | ^^^^^^^^^^^^^^^^^^^^ note: `ibc_proto::ics23::ProofSpec` is defined in crate `ics23` --> /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/ics23-0.12.0/src/cosmos.ics23.v1.rs:141:1 | 141 | pub struct ProofSpec { | ^^^^^^^^^^^^^^^^^^^^ = note: perhaps two different versions of crate `ics23` are being used? note: function defined here --> /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/ics23-0.12.0/src/api.rs:46:8 | 46 | pub fn verify_non_membership<H: HostFunctionsProvider>( | ^^^^^^^^^^^^^^^^^^^^^
the trait bound `std::vec::Vec<ics23::ProofSpec>: core::convert::From<specs::ProofSpecs>` is not satisfied: ibc-core/ics23-commitment/types/src/merkle.rs#L167
error[E0277]: the trait bound `std::vec::Vec<ics23::ProofSpec>: core::convert::From<specs::ProofSpecs>` is not satisfied --> ibc-core/ics23-commitment/types/src/merkle.rs:167:27 | 167 | let ics23_specs = Vec::<ics23::ProofSpec>::from(specs.clone()); | ^^^^^^^^^^^^^^^^^^^^^^^ the trait `core::convert::From<specs::ProofSpecs>` is not implemented for `std::vec::Vec<ics23::ProofSpec>` | = help: the following other types implement trait `core::convert::From<T>`: <std::vec::Vec<T, A> as core::convert::From<std::boxed::Box<[T], A>>> <std::vec::Vec<T, A> as core::convert::From<std::collections::BinaryHeap<T, A>>> <std::vec::Vec<T, A> as core::convert::From<std::collections::VecDeque<T, A>>> <std::vec::Vec<T> as core::convert::From<&[T; N]>> <std::vec::Vec<T> as core::convert::From<&[T]>> <std::vec::Vec<T> as core::convert::From<&mut [T; N]>> <std::vec::Vec<T> as core::convert::From<&mut [T]>> <std::vec::Vec<T> as core::convert::From<[T; N]>> and 12 others
mismatched types: ibc-core/ics23-commitment/types/src/merkle.rs#L137
error[E0308]: mismatched types --> ibc-core/ics23-commitment/types/src/merkle.rs:137:55 | 137 | if !verify_membership::<H>(proof, spec, &subroot, key.as_ref(), &value) { | ---------------------- ^^^^ expected `ibc_proto::ics23::ProofSpec`, found `ics23::ProofSpec` | | | arguments to this function are incorrect | = note: `ics23::ProofSpec` and `ibc_proto::ics23::ProofSpec` have similar names, but are actually distinct types note: `ics23::ProofSpec` is defined in crate `ics23` --> /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/ics23-0.11.3/src/cosmos.ics23.v1.rs:141:1 | 141 | pub struct ProofSpec { | ^^^^^^^^^^^^^^^^^^^^ note: `ibc_proto::ics23::ProofSpec` is defined in crate `ics23` --> /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/ics23-0.12.0/src/cosmos.ics23.v1.rs:141:1 | 141 | pub struct ProofSpec { | ^^^^^^^^^^^^^^^^^^^^ = note: perhaps two different versions of crate `ics23` are being used? note: function defined here --> /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/ics23-0.12.0/src/api.rs:16:8 | 16 | pub fn verify_membership<H: HostFunctionsProvider>( | ^^^^^^^^^^^^^^^^^
the trait bound `std::vec::Vec<ics23::ProofSpec>: core::convert::From<specs::ProofSpecs>` is not satisfied: ibc-core/ics23-commitment/types/src/merkle.rs#L107
error[E0277]: the trait bound `std::vec::Vec<ics23::ProofSpec>: core::convert::From<specs::ProofSpecs>` is not satisfied --> ibc-core/ics23-commitment/types/src/merkle.rs:107:27 | 107 | let ics23_specs = Vec::<ics23::ProofSpec>::from(specs.clone()); | ^^^^^^^^^^^^^^^^^^^^^^^ the trait `core::convert::From<specs::ProofSpecs>` is not implemented for `std::vec::Vec<ics23::ProofSpec>` | = help: the following other types implement trait `core::convert::From<T>`: <std::vec::Vec<T, A> as core::convert::From<std::boxed::Box<[T], A>>> <std::vec::Vec<T, A> as core::convert::From<std::collections::BinaryHeap<T, A>>> <std::vec::Vec<T, A> as core::convert::From<std::collections::VecDeque<T, A>>> <std::vec::Vec<T> as core::convert::From<&[T; N]>> <std::vec::Vec<T> as core::convert::From<&[T]>> <std::vec::Vec<T> as core::convert::From<&mut [T; N]>> <std::vec::Vec<T> as core::convert::From<&mut [T]>> <std::vec::Vec<T> as core::convert::From<[T; N]>> and 12 others
cw-check
Process completed with exit code 101.
the trait bound `specs::ProofSpecs: core::convert::TryFrom<std::vec::Vec<ics23::ProofSpec>>` is not satisfied: ibc-core/ics23-commitment/types/src/specs.rs#L23
error[E0277]: the trait bound `specs::ProofSpecs: core::convert::TryFrom<std::vec::Vec<ics23::ProofSpec>>` is not satisfied --> ibc-core/ics23-commitment/types/src/specs.rs:23:10 | 23 | .try_into() | ^^^^^^^^ the trait `core::convert::From<std::vec::Vec<ics23::ProofSpec>>` is not implemented for `specs::ProofSpecs`, which is required by `std::vec::Vec<ics23::ProofSpec>: core::convert::TryInto<_>` | = note: required for `std::vec::Vec<ics23::ProofSpec>` to implement `core::convert::Into<specs::ProofSpecs>` = note: required for `specs::ProofSpecs` to implement `core::convert::TryFrom<std::vec::Vec<ics23::ProofSpec>>` = note: required for `std::vec::Vec<ics23::ProofSpec>` to implement `core::convert::TryInto<specs::ProofSpecs>`
mismatched types: ibc-core/ics23-commitment/types/src/merkle.rs#L192
error[E0308]: mismatched types --> ibc-core/ics23-commitment/types/src/merkle.rs:192:55 | 192 | if !verify_non_membership::<H>(proof, spec, &subroot, key.as_ref()) { | -------------------------- ^^^^ expected `ibc_proto::ics23::ProofSpec`, found `ics23::ProofSpec` | | | arguments to this function are incorrect | = note: `ics23::ProofSpec` and `ibc_proto::ics23::ProofSpec` have similar names, but are actually distinct types note: `ics23::ProofSpec` is defined in crate `ics23` --> /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/ics23-0.11.3/src/cosmos.ics23.v1.rs:141:1 | 141 | pub struct ProofSpec { | ^^^^^^^^^^^^^^^^^^^^ note: `ibc_proto::ics23::ProofSpec` is defined in crate `ics23` --> /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/ics23-0.12.0/src/cosmos.ics23.v1.rs:141:1 | 141 | pub struct ProofSpec { | ^^^^^^^^^^^^^^^^^^^^ = note: perhaps two different versions of crate `ics23` are being used? note: function defined here --> /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/ics23-0.12.0/src/api.rs:46:8 | 46 | pub fn verify_non_membership<H: HostFunctionsProvider>( | ^^^^^^^^^^^^^^^^^^^^^
the trait bound `std::vec::Vec<ics23::ProofSpec>: core::convert::From<specs::ProofSpecs>` is not satisfied: ibc-core/ics23-commitment/types/src/merkle.rs#L167
error[E0277]: the trait bound `std::vec::Vec<ics23::ProofSpec>: core::convert::From<specs::ProofSpecs>` is not satisfied --> ibc-core/ics23-commitment/types/src/merkle.rs:167:27 | 167 | let ics23_specs = Vec::<ics23::ProofSpec>::from(specs.clone()); | ^^^^^^^^^^^^^^^^^^^^^^^ the trait `core::convert::From<specs::ProofSpecs>` is not implemented for `std::vec::Vec<ics23::ProofSpec>` | = help: the following other types implement trait `core::convert::From<T>`: <std::vec::Vec<T, A> as core::convert::From<std::boxed::Box<[T], A>>> <std::vec::Vec<T, A> as core::convert::From<std::collections::BinaryHeap<T, A>>> <std::vec::Vec<T, A> as core::convert::From<std::collections::VecDeque<T, A>>> <std::vec::Vec<T> as core::convert::From<&[T; N]>> <std::vec::Vec<T> as core::convert::From<&[T]>> <std::vec::Vec<T> as core::convert::From<&mut [T; N]>> <std::vec::Vec<T> as core::convert::From<&mut [T]>> <std::vec::Vec<T> as core::convert::From<[T; N]>> and 12 others
mismatched types: ibc-core/ics23-commitment/types/src/merkle.rs#L137
error[E0308]: mismatched types --> ibc-core/ics23-commitment/types/src/merkle.rs:137:55 | 137 | if !verify_membership::<H>(proof, spec, &subroot, key.as_ref(), &value) { | ---------------------- ^^^^ expected `ibc_proto::ics23::ProofSpec`, found `ics23::ProofSpec` | | | arguments to this function are incorrect | = note: `ics23::ProofSpec` and `ibc_proto::ics23::ProofSpec` have similar names, but are actually distinct types note: `ics23::ProofSpec` is defined in crate `ics23` --> /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/ics23-0.11.3/src/cosmos.ics23.v1.rs:141:1 | 141 | pub struct ProofSpec { | ^^^^^^^^^^^^^^^^^^^^ note: `ibc_proto::ics23::ProofSpec` is defined in crate `ics23` --> /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/ics23-0.12.0/src/cosmos.ics23.v1.rs:141:1 | 141 | pub struct ProofSpec { | ^^^^^^^^^^^^^^^^^^^^ = note: perhaps two different versions of crate `ics23` are being used? note: function defined here --> /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/ics23-0.12.0/src/api.rs:16:8 | 16 | pub fn verify_membership<H: HostFunctionsProvider>( | ^^^^^^^^^^^^^^^^^
the trait bound `std::vec::Vec<ics23::ProofSpec>: core::convert::From<specs::ProofSpecs>` is not satisfied: ibc-core/ics23-commitment/types/src/merkle.rs#L107
error[E0277]: the trait bound `std::vec::Vec<ics23::ProofSpec>: core::convert::From<specs::ProofSpecs>` is not satisfied --> ibc-core/ics23-commitment/types/src/merkle.rs:107:27 | 107 | let ics23_specs = Vec::<ics23::ProofSpec>::from(specs.clone()); | ^^^^^^^^^^^^^^^^^^^^^^^ the trait `core::convert::From<specs::ProofSpecs>` is not implemented for `std::vec::Vec<ics23::ProofSpec>` | = help: the following other types implement trait `core::convert::From<T>`: <std::vec::Vec<T, A> as core::convert::From<std::boxed::Box<[T], A>>> <std::vec::Vec<T, A> as core::convert::From<std::collections::BinaryHeap<T, A>>> <std::vec::Vec<T, A> as core::convert::From<std::collections::VecDeque<T, A>>> <std::vec::Vec<T> as core::convert::From<&[T; N]>> <std::vec::Vec<T> as core::convert::From<&[T]>> <std::vec::Vec<T> as core::convert::From<&mut [T; N]>> <std::vec::Vec<T> as core::convert::From<&mut [T]>> <std::vec::Vec<T> as core::convert::From<[T; N]>> and 12 others