Skip to content

Commit

Permalink
Polkadot v1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivan Leshchenko authored and Ivan Leshchenko committed Jul 21, 2023
1 parent 09b53dc commit 551b67b
Show file tree
Hide file tree
Showing 8 changed files with 90 additions and 25 deletions.
16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@ scale-info = { version = "2.3", default-features = false, features = ["derive"]
obce-macro = { path = "macro", default-features = false }

# Substrate deps
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false, optional = true }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false, optional = true }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false, optional = true }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false, optional = true }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false, optional = true }
pallet-contracts = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false, optional = true }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
pallet-contracts = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }

# Ink deps
ink = { version = "4.2.0", default-features = false, optional = true }
ink_engine = { version = "4.2.0", default-features = false, optional = true }

[dev-dependencies]
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false, features = ["std"] }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false, features = ["std"] }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, features = ["std"] }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, features = ["std"] }
ink = { version = "4.2.0", default-features = false, features = ["std"] }
trybuild = "1.0"

Expand Down
2 changes: 1 addition & 1 deletion examples/rand-extension/chain-extension/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ scale-info = { version = "2", default-features = false, features = ["derive"] }

ink = { version = "4.2.0", default-features = false, optional = true }

pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false, optional = true }
pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }

[features]
default = ["std"]
Expand Down
42 changes: 30 additions & 12 deletions flake.lock

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

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@
};

rustToolchain = with fenix.packages.${system}; combine [
(complete.withComponents [
(stable.withComponents [
"rustc"
"cargo"
"clippy"
"rustfmt"
"rust-src"
])
targets."wasm32-unknown-unknown".latest.rust-std
targets."wasm32-unknown-unknown".stable.rust-std
];
in {
devShells.default = pkgs.mkShell {
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/ink/mock/fail_incorrect_inputs.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ error[E0308]: mismatched types
| expected `u32`, found `()`
| arguments to this function are incorrect
|
note: associated function defined here
note: method defined here
--> tests/ui/ink/mock/fail_incorrect_inputs.rs:8:8
|
8 | fn method(&self, val: u32) -> u64 {
Expand Down
1 change: 0 additions & 1 deletion tests/ui/ink/mock/fail_random_trait.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ error[E0277]: the trait bound `(dyn Trait + 'static): ExtensionDescription` is n
| ^^^^^^^^^^^^^ the trait `ExtensionDescription` is not implemented for `(dyn Trait + 'static)`
|
= help: see issue #48214
= help: add `#![feature(trivial_bounds)]` to the crate attributes to enable
= note: this error originates in the attribute macro `obce::mock` (in Nightly builds, run with -Z macro-backtrace for more info)
24 changes: 24 additions & 0 deletions tests/ui/substrate/error/fail_duplicated_ret_val.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,33 @@ error[E0433]: failed to resolve: use of undeclared type `Error`
|
16 | assert_encode_holds(Error::One);
| ^^^^^ use of undeclared type `Error`
|
help: consider importing one of these items
|
1 + use core::error::Error;
|
1 + use core::fmt::Error;
|
1 + use frame_support::dispatch::fmt::Error;
|
1 + use frame_system::Error;
|
and 5 other candidates

error[E0433]: failed to resolve: use of undeclared type `Error`
--> tests/ui/substrate/error/fail_duplicated_ret_val.rs:17:27
|
17 | assert_try_from_holds(Error::One);
| ^^^^^ use of undeclared type `Error`
|
help: consider importing one of these items
|
1 + use core::error::Error;
|
1 + use core::fmt::Error;
|
1 + use frame_support::dispatch::fmt::Error;
|
1 + use frame_system::Error;
|
and 5 other candidates
24 changes: 24 additions & 0 deletions tests/ui/substrate/error/fail_enforced_ret_val.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,33 @@ error[E0433]: failed to resolve: use of undeclared type `Error`
|
14 | assert_encode_holds(Error::One);
| ^^^^^ use of undeclared type `Error`
|
help: consider importing one of these items
|
1 + use core::error::Error;
|
1 + use core::fmt::Error;
|
1 + use frame_support::dispatch::fmt::Error;
|
1 + use frame_system::Error;
|
and 5 other candidates

error[E0433]: failed to resolve: use of undeclared type `Error`
--> tests/ui/substrate/error/fail_enforced_ret_val.rs:15:27
|
15 | assert_try_from_holds(Error::One);
| ^^^^^ use of undeclared type `Error`
|
help: consider importing one of these items
|
1 + use core::error::Error;
|
1 + use core::fmt::Error;
|
1 + use frame_support::dispatch::fmt::Error;
|
1 + use frame_system::Error;
|
and 5 other candidates

0 comments on commit 551b67b

Please sign in to comment.