Skip to content

Use workspace for scale #1

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

Closed
xgreenx wants to merge 16 commits into from
Closed

Use workspace for scale #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8a1eeb7
Workspace properties
pmikolajczyk41 Jul 4, 2023
4664a33
Workspace dependencies
pmikolajczyk41 Jul 4, 2023
76f5e72
Add JB to .gitignore
pmikolajczyk41 Jul 4, 2023
fcb1bb8
Import fixes
pmikolajczyk41 Jul 4, 2023
d3a33a8
default-features = false
pmikolajczyk41 Jul 4, 2023
11b734e
Don't require parity-scale-codec in contracts
pmikolajczyk41 Jul 4, 2023
44da7e5
Remove .idea from .gitignore
pmikolajczyk41 Jul 4, 2023
eea927a
Spellcheck
pmikolajczyk41 Jul 4, 2023
906d09e
Checkpoint
pmikolajczyk41 Jul 4, 2023
08c1937
Now?
pmikolajczyk41 Jul 4, 2023
e8fbe89
#[codec(crate = scale)]
pmikolajczyk41 Jul 5, 2023
fdebbd5
Revert "#[codec(crate = scale)]"
pmikolajczyk41 Jul 5, 2023
22c1dec
Merge remote-tracking branch 'origin/master' into pmikolajczyk41/1814
pmikolajczyk41 Jul 5, 2023
7821609
Do not inherit scale
pmikolajczyk41 Jul 5, 2023
574f5f2
Revert ui test changes
pmikolajczyk41 Jul 5, 2023
bdd4900
Use `workspace` for `scale`
xgreenx Jul 18, 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
Next Next commit
Revert ui test changes
  • Loading branch information
@pmikolajczyk41
pmikolajczyk41 committed Jul 5, 2023
commit 574f5f20b51a99da8e04145b350ef544d613a609
6 changes: 3 additions & 3 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 @@ -8,7 +8,7 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeDecode` is not satisfied
Arc<T>
Box<T>
Rc<T>
= note: required for `NonCodecType` to implement `scale::Decode`
= note: required for `NonCodecType` to implement `parity_scale_codec::Decode`
note: required by a bound in `DispatchInput`
--> src/codegen/dispatch/type_check.rs
|
Expand All @@ -25,7 +25,7 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeDecode` is not satisfied
Arc<T>
Box<T>
Rc<T>
= note: required for `NonCodecType` to implement `scale::Decode`
= note: required for `NonCodecType` to implement `parity_scale_codec::Decode`

error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
--> tests/ui/contract/fail/constructor-input-non-codec.rs:1:1
Expand All @@ -45,7 +45,7 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
Rc<T>
String
Vec<T>
scale::Ref<'a, T, U>
parity_scale_codec::Ref<'a, T, U>
= note: required for `NonCodecType` to implement `Encode`
note: required by a bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
--> $WORKSPACE/crates/env/src/call/execution_input.rs
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -21,7 +21,7 @@ error[E0277]: the trait bound `contract::Error: WrapperTypeDecode` is not satisf
Arc<T>
Box<T>
Rc<T>
= note: required for `contract::Error` to implement `scale::Decode`
= note: required for `contract::Error` to implement `parity_scale_codec::Decode`
= note: required for `Result<ContractRef, contract::Error>` to implement `ConstructorReturnType<ContractRef>`
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
Expand Down
2 changes: 1 addition & 1 deletion crates/ink/tests/ui/contract/fail/constructor-self-receiver-03.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ error[E0277]: the trait bound `&Contract: WrapperTypeDecode` is not satisfied
Arc<T>
Box<T>
Rc<T>
= note: required for `&Contract` to implement `scale::Decode`
= note: required for `&Contract` to implement `parity_scale_codec::Decode`
6 changes: 3 additions & 3 deletions 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 @@ -8,7 +8,7 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeDecode` is not satisfied
Arc<T>
Box<T>
Rc<T>
= note: required for `NonCodecType` to implement `scale::Decode`
= note: required for `NonCodecType` to implement `parity_scale_codec::Decode`
note: required by a bound in `DispatchInput`
--> src/codegen/dispatch/type_check.rs
|
Expand All @@ -25,7 +25,7 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeDecode` is not satisfied
Arc<T>
Box<T>
Rc<T>
= note: required for `NonCodecType` to implement `scale::Decode`
= note: required for `NonCodecType` to implement `parity_scale_codec::Decode`

error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
--> tests/ui/contract/fail/message-input-non-codec.rs:1:1
Expand All @@ -45,7 +45,7 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
Rc<T>
String
Vec<T>
scale::Ref<'a, T, U>
parity_scale_codec::Ref<'a, T, U>
= note: required for `NonCodecType` to implement `Encode`
note: required by a bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
--> $WORKSPACE/crates/env/src/call/execution_input.rs
Expand Down
8 changes: 4 additions & 4 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 @@ -13,7 +13,7 @@ error[E0277]: the trait bound `NonCodecType: WrapperTypeEncode` is not satisfied
Rc<T>
String
Vec<T>
scale::Ref<'a, T, U>
parity_scale_codec::Ref<'a, T, U>
= note: required for `NonCodecType` to implement `Encode`
note: required by a bound in `DispatchOutput`
--> src/codegen/dispatch/type_check.rs
Expand All @@ -38,14 +38,14 @@ error[E0599]: the method `try_invoke` exists for struct `CallBuilder<DefaultEnvi
--> tests/ui/contract/fail/message-returns-non-codec.rs:16:9
|
4 | pub struct NonCodecType;
| ----------------------- doesn't satisfy `NonCodecType: scale::Decode`
| ----------------------- doesn't satisfy `NonCodecType: parity_scale_codec::Decode`
...
16 | pub fn message(&self) -> NonCodecType {
| ^^^ method cannot be called due to unsatisfied trait bounds
|
= note: the following trait bounds were not satisfied:
`NonCodecType: scale::Decode`
note: the trait `scale::Decode` must be implemented
`NonCodecType: parity_scale_codec::Decode`
note: the trait `parity_scale_codec::Decode` must be implemented
--> $CARGO/parity-scale-codec-3.6.3/src/codec.rs
|
| pub trait Decode: Sized {
Expand Down
18 changes: 9 additions & 9 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
@@ -1,10 +1,10 @@
error[E0277]: the trait bound `Vec<NonPacked>: scale::Decode` is not satisfied
error[E0277]: the trait bound `Vec<NonPacked>: parity_scale_codec::Decode` is not satisfied
--> tests/ui/storage_item/fail/collections_only_packed_1.rs:11:8
|
11 | a: Vec<NonPacked>,
| ^^^ the trait `scale::Decode` is not implemented for `Vec<NonPacked>`
| ^^^ the trait `parity_scale_codec::Decode` is not implemented for `Vec<NonPacked>`
|
= help: the trait `scale::Decode` is implemented for `Vec<T>`
= help: the trait `parity_scale_codec::Decode` is implemented for `Vec<T>`
= note: required for `Vec<NonPacked>` to implement `Packed`
= note: required for `Vec<NonPacked>` to implement `StorableHint<()>`
= note: required for `Vec<NonPacked>` to implement `AutoStorableHint<ManualKey<453539032>>`
Expand All @@ -23,13 +23,13 @@ error[E0277]: the trait bound `[NonPacked]: Encode` is not satisfied
= note: required for `Vec<NonPacked>` to implement `StorableHint<()>`
= note: required for `Vec<NonPacked>` to implement `AutoStorableHint<ManualKey<453539032>>`

error[E0277]: the trait bound `Vec<NonPacked>: scale::Decode` is not satisfied
error[E0277]: the trait bound `Vec<NonPacked>: parity_scale_codec::Decode` is not satisfied
--> tests/ui/storage_item/fail/collections_only_packed_1.rs:10:8
|
10 | struct Contract {
| ^^^^^^^^ the trait `scale::Decode` is not implemented for `Vec<NonPacked>`
| ^^^^^^^^ the trait `parity_scale_codec::Decode` is not implemented for `Vec<NonPacked>`
|
= help: the trait `scale::Decode` is implemented for `Vec<T>`
= help: the trait `parity_scale_codec::Decode` is implemented for `Vec<T>`
= note: required for `Vec<NonPacked>` to implement `Packed`
= note: required for `Vec<NonPacked>` to implement `StorableHint<()>`
= note: required for `Vec<NonPacked>` to implement `AutoStorableHint<ManualKey<453539032>>`
Expand Down Expand Up @@ -68,13 +68,13 @@ note: required by a bound in `Storable`
| pub trait Storable: Sized {
| ^^^^^ required by this bound in `Storable`

error[E0277]: the trait bound `Vec<NonPacked>: scale::Decode` is not satisfied
error[E0277]: the trait bound `Vec<NonPacked>: parity_scale_codec::Decode` is not satisfied
--> tests/ui/storage_item/fail/collections_only_packed_1.rs:9:1
|
9 | #[ink::storage_item]
| ^^^^^^^^^^^^^^^^^^^^ the trait `scale::Decode` is not implemented for `Vec<NonPacked>`
| ^^^^^^^^^^^^^^^^^^^^ the trait `parity_scale_codec::Decode` is not implemented for `Vec<NonPacked>`
|
= help: the trait `scale::Decode` is implemented for `Vec<T>`
= help: the trait `parity_scale_codec::Decode` is implemented for `Vec<T>`
= note: required for `Vec<NonPacked>` to implement `Packed`
= note: required for `Vec<NonPacked>` to implement `StorableHint<()>`
= note: required for `Vec<NonPacked>` to implement `AutoStorableHint<ManualKey<453539032>>`
Expand Down
18 changes: 9 additions & 9 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
@@ -1,10 +1,10 @@
error[E0277]: the trait bound `BTreeMap<u128, NonPacked>: scale::Decode` is not satisfied
error[E0277]: the trait bound `BTreeMap<u128, NonPacked>: parity_scale_codec::Decode` is not satisfied
--> tests/ui/storage_item/fail/collections_only_packed_2.rs:11:8
|
11 | a: BTreeMap<u128, NonPacked>,
| ^^^^^^^^ the trait `scale::Decode` is not implemented for `BTreeMap<u128, NonPacked>`
| ^^^^^^^^ the trait `parity_scale_codec::Decode` is not implemented for `BTreeMap<u128, NonPacked>`
|
= help: the trait `scale::Decode` is implemented for `BTreeMap<K, V>`
= help: the trait `parity_scale_codec::Decode` is implemented for `BTreeMap<K, V>`
= note: required for `BTreeMap<u128, NonPacked>` to implement `Packed`
= note: required for `BTreeMap<u128, NonPacked>` to implement `StorableHint<()>`
= note: required for `BTreeMap<u128, NonPacked>` to implement `AutoStorableHint<ManualKey<453539032>>`
Expand All @@ -20,13 +20,13 @@ error[E0277]: the trait bound `BTreeMap<u128, NonPacked>: Encode` is not satisfi
= note: required for `BTreeMap<u128, NonPacked>` to implement `StorableHint<()>`
= note: required for `BTreeMap<u128, NonPacked>` to implement `AutoStorableHint<ManualKey<453539032>>`

error[E0277]: the trait bound `BTreeMap<u128, NonPacked>: scale::Decode` is not satisfied
error[E0277]: the trait bound `BTreeMap<u128, NonPacked>: parity_scale_codec::Decode` is not satisfied
--> tests/ui/storage_item/fail/collections_only_packed_2.rs:10:8
|
10 | struct Contract {
| ^^^^^^^^ the trait `scale::Decode` is not implemented for `BTreeMap<u128, NonPacked>`
| ^^^^^^^^ the trait `parity_scale_codec::Decode` is not implemented for `BTreeMap<u128, NonPacked>`
|
= help: the trait `scale::Decode` is implemented for `BTreeMap<K, V>`
= help: the trait `parity_scale_codec::Decode` is implemented for `BTreeMap<K, V>`
= note: required for `BTreeMap<u128, NonPacked>` to implement `Packed`
= note: required for `BTreeMap<u128, NonPacked>` to implement `StorableHint<()>`
= note: required for `BTreeMap<u128, NonPacked>` to implement `AutoStorableHint<ManualKey<453539032>>`
Expand Down Expand Up @@ -62,13 +62,13 @@ note: required by a bound in `Storable`
| pub trait Storable: Sized {
| ^^^^^ required by this bound in `Storable`

error[E0277]: the trait bound `BTreeMap<u128, NonPacked>: scale::Decode` is not satisfied
error[E0277]: the trait bound `BTreeMap<u128, NonPacked>: parity_scale_codec::Decode` is not satisfied
--> tests/ui/storage_item/fail/collections_only_packed_2.rs:9:1
|
9 | #[ink::storage_item]
| ^^^^^^^^^^^^^^^^^^^^ the trait `scale::Decode` is not implemented for `BTreeMap<u128, NonPacked>`
| ^^^^^^^^^^^^^^^^^^^^ the trait `parity_scale_codec::Decode` is not implemented for `BTreeMap<u128, NonPacked>`
|
= help: the trait `scale::Decode` is implemented for `BTreeMap<K, V>`
= help: the trait `parity_scale_codec::Decode` is implemented for `BTreeMap<K, V>`
= note: required for `BTreeMap<u128, NonPacked>` to implement `Packed`
= note: required for `BTreeMap<u128, NonPacked>` to implement `StorableHint<()>`
= note: required for `BTreeMap<u128, NonPacked>` to implement `AutoStorableHint<ManualKey<453539032>>`
Expand Down
4 changes: 2 additions & 2 deletions crates/ink/tests/ui/storage_item/fail/packed_is_not_derived_automatically.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ error[E0277]: the trait bound `NonPacked: WrapperTypeDecode` is not satisfied
Arc<T>
Box<T>
Rc<T>
= note: required for `NonPacked` to implement `scale::Decode`
= note: required for `NonPacked` to implement `parity_scale_codec::Decode`
= note: required for `NonPacked` to implement `Packed`
note: required by a bound in `consume_packed`
--> tests/ui/storage_item/fail/packed_is_not_derived_automatically.rs:12:22
Expand All @@ -31,7 +31,7 @@ error[E0277]: the trait bound `NonPacked: WrapperTypeEncode` is not satisfied
Rc<T>
String
Vec<T>
scale::Ref<'a, T, U>
parity_scale_codec::Ref<'a, T, U>
= note: required for `NonPacked` to implement `Encode`
= note: required for `NonPacked` to implement `Packed`
note: required by a bound in `consume_packed`
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -8,7 +8,7 @@ error[E0277]: the trait bound `NonCodec: WrapperTypeDecode` is not satisfied
Arc<T>
Box<T>
Rc<T>
= note: required for `NonCodec` to implement `scale::Decode`
= note: required for `NonCodec` to implement `parity_scale_codec::Decode`
note: required by a bound in `DispatchInput`
--> src/codegen/dispatch/type_check.rs
|
Expand All @@ -33,7 +33,7 @@ error[E0277]: the trait bound `NonCodec: WrapperTypeEncode` is not satisfied
Rc<T>
String
Vec<T>
scale::Ref<'a, T, U>
parity_scale_codec::Ref<'a, T, U>
= note: required for `NonCodec` to implement `Encode`
note: required by a bound in `ExecutionInput::<ArgumentList<ArgumentListEnd, ArgumentListEnd>>::push_arg`
--> $WORKSPACE/crates/env/src/call/execution_input.rs
Expand Down
8 changes: 4 additions & 4 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 @@ -13,7 +13,7 @@ error[E0277]: the trait bound `NonCodec: WrapperTypeEncode` is not satisfied
Rc<T>
String
Vec<T>
scale::Ref<'a, T, U>
parity_scale_codec::Ref<'a, T, U>
= note: required for `NonCodec` to implement `Encode`
note: required by a bound in `DispatchOutput`
--> src/codegen/dispatch/type_check.rs
Expand All @@ -25,16 +25,16 @@ error[E0599]: the method `try_invoke` exists for struct `CallBuilder<E, Set<Call
--> tests/ui/trait_def/fail/message_output_non_codec.rs:5:5
|
1 | pub struct NonCodec;
| ------------------- doesn't satisfy `NonCodec: scale::Decode`
| ------------------- doesn't satisfy `NonCodec: parity_scale_codec::Decode`
...
5 | #[ink(message)]
| ^
| |
| method cannot be called due to unsatisfied trait bounds
|
= note: the following trait bounds were not satisfied:
`NonCodec: scale::Decode`
note: the trait `scale::Decode` must be implemented
`NonCodec: parity_scale_codec::Decode`
note: the trait `parity_scale_codec::Decode` must be implemented
--> $CARGO/parity-scale-codec-3.6.3/src/codec.rs
|
| pub trait Decode: Sized {
Expand Down