Skip to content

Enable Rust >= 1.70, update subxt and contract-build #1855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SkymanOne merged 15 commits into from
Jul 26, 2023
Merged

Enable Rust >= 1.70, update subxt and contract-build #1855

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
db9252a
WIP start using subxt-signer crate
ascjones Jul 25, 2023
c725c68
WIP updating subxt signing
ascjones Jul 25, 2023
8467a66
Fix signer errors
ascjones Jul 25, 2023
ca7daed
Expose dev accounts
ascjones Jul 25, 2023
e720512
Merge branch 'master' into aj/update-subxt
ascjones Jul 25, 2023
627eedc
Use workspace deps
ascjones Jul 25, 2023
12d4a39
Merge branch 'master' into aj/update-subxt
ascjones Jul 26, 2023
7368ffa
Default build args
ascjones Jul 26, 2023
64ba4ce
Use latest CI image for stable Rust
ascjones Jul 26, 2023
fce97f4
Clippy
ascjones Jul 26, 2023
47ddfe0
Latest subxt
ascjones Jul 26, 2023
ee43602
Fix UI tests
ascjones Jul 26, 2023
36fe13b
Fix UI tests for 1.70
ascjones Jul 26, 2023
98bc3d5
Use bullseye 1.71
ascjones Jul 26, 2023
5982f23
UI tests for 1.71
ascjones Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
UI tests for 1.71
  • Loading branch information
@ascjones
ascjones committed Jul 26, 2023
commit 5982f23e49a431596433eddb0a61c12c4da38ae9
6 changes: 6 additions & 0 deletions crates/ink/tests/ui/contract/fail/constructor-input-non-codec.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeDecode` is not satisfied
note: required by a bound in `DispatchInput`
--> src/codegen/dispatch/type_check.rs
|
| pub struct DispatchInput<T>(T)
| ------------- required by a bound in this struct
| where
| T: scale::Decode + 'static;
| ^^^^^^^^^^^^^ required by this bound in `DispatchInput`

Expand Down Expand Up @@ -50,5 +53,8 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
note: required by a bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
--> $WORKSPACE/crates/env/src/call/execution_input.rs
|
| pub fn push_arg<T>(
| -------- required by a bound in this associated function
...
| T: scale::Encode,
| ^^^^^^^^^^^^^ required by this bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
9 changes: 9 additions & 0 deletions crates/ink/tests/ui/contract/fail/constructor-return-result-non-codec-error.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ error[E0277]: the trait bound `Result<Result<(), &contract::Error>, LangError>:
note: required by a bound in `return_value`
--> $WORKSPACE/crates/env/src/api.rs
|
| pub fn return_value<R>(return_flags: ReturnFlags, return_value: &R) -> !
| ------------ required by a bound in this function
| where
| R: scale::Encode,
| ^^^^^^^^^^^^^ required by this bound in `return_value`

Expand All @@ -26,6 +29,9 @@ error[E0277]: the trait bound `contract::Error: WrapperTypeDecode` is not satisf
note: required by a bound in `CreateBuilder::<E, ContractRef, CodeHash, GasLimit, Endowment, Args, Salt, Unset<ReturnType<()>>>::returns`
--> $WORKSPACE/crates/env/src/call/create_builder.rs
|
| pub fn returns<R>(
| ------- required by a bound in this associated function
...
| R: ConstructorReturnType<ContractRef>,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `CreateBuilder::<E, ContractRef, CodeHash, GasLimit, Endowment, Args, Salt, Unset<ReturnType<()>>>::returns`

Expand All @@ -51,5 +57,8 @@ error[E0277]: the trait bound `contract::Error: TypeInfo` is not satisfied
note: required by a bound in `TypeSpec::with_name_str`
--> $WORKSPACE/crates/metadata/src/specs.rs
|
| pub fn with_name_str<T>(display_name: &'static str) -> Self
| ------------- required by a bound in this associated function
| where
| T: TypeInfo + 'static,
| ^^^^^^^^ required by this bound in `TypeSpec::with_name_str`
8 changes: 7 additions & 1 deletion crates/ink/tests/ui/contract/fail/message-input-non-codec.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeDecode` is not satisfied
note: required by a bound in `DispatchInput`
--> src/codegen/dispatch/type_check.rs
|
| pub struct DispatchInput<T>(T)
| ------------- required by a bound in this struct
| where
| T: scale::Decode + 'static;
| ^^^^^^^^^^^^^ required by this bound in `DispatchInput`

Expand Down Expand Up @@ -50,6 +53,9 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
note: required by a bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
--> $WORKSPACE/crates/env/src/call/execution_input.rs
|
| pub fn push_arg<T>(
| -------- required by a bound in this associated function
...
| T: scale::Encode,
| ^^^^^^^^^^^^^ required by this bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`

Expand All @@ -65,4 +71,4 @@ error[E0599]: the method `try_invoke` exists for struct `CallBuilder<DefaultEnvi
| ----------------------------------- doesn't satisfy `_: Encode`
|
= note: the following trait bounds were not satisfied:
`ArgumentList<ink::ink_env::call::utils::Argument<NonCodecType>, ArgumentList<ArgumentListEnd, ArgumentListEnd>>: Encode`
`ArgumentList<Argument<NonCodecType>, ArgumentList<ArgumentListEnd, ArgumentListEnd>>: Encode`
6 changes: 6 additions & 0 deletions crates/ink/tests/ui/contract/fail/message-returns-non-codec.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
note: required by a bound in `DispatchOutput`
--> src/codegen/dispatch/type_check.rs
|
| pub struct DispatchOutput<T>(T)
| -------------- required by a bound in this struct
| where
| T: scale::Encode + 'static;
| ^^^^^^^^^^^^^ required by this bound in `DispatchOutput`

Expand All @@ -31,6 +34,9 @@ error[E0277]: the trait bound `Result<NonCodecType, LangError>: Encode` is not s
note: required by a bound in `return_value`
--> $WORKSPACE/crates/env/src/api.rs
|
| pub fn return_value<R>(return_flags: ReturnFlags, return_value: &R) -> !
| ------------ required by a bound in this function
| where
| R: scale::Encode,
| ^^^^^^^^^^^^^ required by this bound in `return_value`

Expand Down
6 changes: 6 additions & 0 deletions crates/ink/tests/ui/storage_item/fail/collections_only_packed_1.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ note: required because it appears within the type `Contract`
| ^^^^^^^^
note: required by a bound in `Result`
--> $RUST/core/src/result.rs
|
| pub enum Result<T, E> {
| ^ required by this bound in `Result`
= note: this error originates in the derive macro `::ink::storage::traits::Storable` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0277]: the trait bound `[NonPacked]: Encode` is not satisfied
Expand All @@ -107,4 +110,7 @@ note: required because it appears within the type `Contract`
| ^^^^^^^^
note: required by a bound in `Result`
--> $RUST/core/src/result.rs
|
| pub enum Result<T, E> {
| ^ required by this bound in `Result`
= note: this error originates in the derive macro `::ink::storage::traits::Storable` (in Nightly builds, run with -Z macro-backtrace for more info)
6 changes: 6 additions & 0 deletions crates/ink/tests/ui/storage_item/fail/collections_only_packed_2.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ note: required because it appears within the type `Contract`
| ^^^^^^^^
note: required by a bound in `Result`
--> $RUST/core/src/result.rs
|
| pub enum Result<T, E> {
| ^ required by this bound in `Result`
= note: this error originates in the derive macro `::ink::storage::traits::Storable` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0277]: the trait bound `BTreeMap<u128, NonPacked>: Encode` is not satisfied
Expand All @@ -98,4 +101,7 @@ note: required because it appears within the type `Contract`
| ^^^^^^^^
note: required by a bound in `Result`
--> $RUST/core/src/result.rs
|
| pub enum Result<T, E> {
| ^ required by this bound in `Result`
= note: this error originates in the derive macro `::ink::storage::traits::Storable` (in Nightly builds, run with -Z macro-backtrace for more info)
8 changes: 7 additions & 1 deletion crates/ink/tests/ui/trait_def/fail/message_input_non_codec.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ error[E0277]: the trait bound `NonCodec: WrapperTypeDecode` is not satisfied
note: required by a bound in `DispatchInput`
--> src/codegen/dispatch/type_check.rs
|
| pub struct DispatchInput<T>(T)
| ------------- required by a bound in this struct
| where
| T: scale::Decode + 'static;
| ^^^^^^^^^^^^^ required by this bound in `DispatchInput`

Expand All @@ -38,6 +41,9 @@ error[E0277]: the trait bound `NonCodec: WrapperTypeEncode` is not satisfied
note: required by a bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
--> $WORKSPACE/crates/env/src/call/execution_input.rs
|
| pub fn push_arg<T>(
| -------- required by a bound in this associated function
...
| T: scale::Encode,
| ^^^^^^^^^^^^^ required by this bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`

Expand All @@ -53,4 +59,4 @@ error[E0599]: the method `try_invoke` exists for struct `CallBuilder<E, Set<Call
| ----------------------------------- doesn't satisfy `_: Encode`
|
= note: the following trait bounds were not satisfied:
`ArgumentList<ink::ink_env::call::utils::Argument<NonCodec>, ArgumentList<ArgumentListEnd, ArgumentListEnd>>: Encode`
`ArgumentList<Argument<NonCodec>, ArgumentList<ArgumentListEnd, ArgumentListEnd>>: Encode`
3 changes: 3 additions & 0 deletions crates/ink/tests/ui/trait_def/fail/message_output_non_codec.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ error[E0277]: the trait bound `NonCodec: WrapperTypeEncode` is not satisfied
note: required by a bound in `DispatchOutput`
--> src/codegen/dispatch/type_check.rs
|
| pub struct DispatchOutput<T>(T)
| -------------- required by a bound in this struct
| where
| T: scale::Encode + 'static;
| ^^^^^^^^^^^^^ required by this bound in `DispatchOutput`

Expand Down