Skip to content

Commit 83a76c2

Browse files
xlcxlc
authored
use workspace deps (#960)
* use workspace deps * fix * fix * fix * fix * bump
1 parent b3694e6 commit 83a76c2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+422
-391
lines changed

‎Cargo.dev.toml

+68-60
Large diffs are not rendered by default.

‎asset-registry/Cargo.toml

+28-28
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,50 @@ name = "orml-asset-registry"
33
description = "Registry for (foreign) assets"
44
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/asset-registry"
55
license = "Apache-2.0"
6-
version = "0.4.1-dev"
6+
version = "0.5.0-dev"
77
authors = ["Interlay Ltd, etc"]
88
edition = "2021"
99

1010
[dependencies]
11-
log = { version = "0.4.20", default-features = false }
12-
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
13-
serde = { version = "1.0.136", optional = true }
14-
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
11+
log = { workspace = true }
12+
scale-info = { workspace = true }
13+
serde = { workspace = true, optional = true }
14+
parity-scale-codec = { workspace = true }
1515

1616
# substrate
17-
frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
18-
frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
19-
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
20-
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
21-
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
17+
frame-support = { workspace = true }
18+
frame-system = { workspace = true }
19+
sp-io = { workspace = true }
20+
sp-runtime = { workspace = true }
21+
sp-std = { workspace = true }
2222

2323
# polkadot
24-
pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
25-
xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
26-
xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
27-
xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
24+
pallet-xcm = { workspace = true }
25+
xcm = { workspace = true }
26+
xcm-builder = { workspace = true }
27+
xcm-executor = { workspace = true }
2828

2929
# orml
30-
orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
30+
orml-traits = { path = "../traits", version = "0.5.0-dev", default-features = false }
3131

3232
[dev-dependencies]
3333
# substrate
34-
pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
35-
sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
36-
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
37-
pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
34+
pallet-balances = { workspace = true, features = ["std"] }
35+
sp-core = { workspace = true, features = ["std"] }
36+
sp-io = { workspace = true, features = ["std"] }
37+
pallet-message-queue = { workspace = true, features = ["std"] }
3838

3939
# cumulus
40-
cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
41-
cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
42-
cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
43-
cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
44-
parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
40+
cumulus-primitives-core = { workspace = true, features = ["std"] }
41+
cumulus-pallet-dmp-queue = { workspace = true, features = ["std"] }
42+
cumulus-pallet-xcmp-queue = { workspace = true, features = ["std"] }
43+
cumulus-pallet-xcm = { workspace = true, features = ["std"] }
44+
parachain-info = { workspace = true, features = ["std"] }
4545

4646
# polkadot
47-
polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
48-
polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
49-
xcm-simulator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
47+
polkadot-parachain-primitives = { workspace = true, features = ["std"] }
48+
polkadot-runtime-parachains = { workspace = true, features = ["std"] }
49+
xcm-simulator = { workspace = true }
5050

5151
# orml
5252
orml-tokens = { path = "../tokens" }
@@ -59,7 +59,7 @@ default = ["std"]
5959
std = [
6060
"serde",
6161

62-
"codec/std",
62+
"parity-scale-codec/std",
6363
"frame-support/std",
6464
"frame-system/std",
6565
"orml-traits/std",

‎asset-registry/src/mock/mod.rs

+13-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,19 @@ pub const ALICE: AccountId32 = AccountId32::new([0u8; 32]);
1717
pub const BOB: AccountId32 = AccountId32::new([1u8; 32]);
1818
pub const CHARLIE: AccountId32 = AccountId32::new([2u8; 32]);
1919

20-
#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, codec::MaxEncodedLen, TypeInfo)]
20+
#[derive(
21+
Encode,
22+
Decode,
23+
Eq,
24+
PartialEq,
25+
Copy,
26+
Clone,
27+
RuntimeDebug,
28+
PartialOrd,
29+
Ord,
30+
parity_scale_codec::MaxEncodedLen,
31+
TypeInfo,
32+
)]
2133
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
2234
pub enum CurrencyId {
2335
/// Relay chain token.

‎asset-registry/src/mock/para.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use super::{Amount, Balance, CurrencyId, CurrencyIdConvert, ParachainXcmRouter};
22

33
use crate as orml_asset_registry;
44

5-
use codec::{Decode, Encode, MaxEncodedLen};
65
use cumulus_primitives_core::{ChannelStatus, GetChannelInfo, ParaId};
76
use frame_support::traits::{EnsureOrigin, EnsureOriginWithArg};
87
use frame_support::{
@@ -19,7 +18,8 @@ use orml_traits::{
1918
};
2019
use orml_xcm_support::{IsNativeConcrete, MultiCurrencyAdapter, MultiNativeAsset};
2120
use pallet_xcm::XcmPassthrough;
22-
use polkadot_parachain::primitives::Sibling;
21+
use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
22+
use polkadot_parachain_primitives::primitives::Sibling;
2323
use sp_core::H256;
2424
use sp_runtime::{
2525
traits::{AccountIdConversion, Convert, IdentityLookup},

‎asset-registry/src/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use frame_support::{
1111
};
1212
use mock::{para::RuntimeCall, *};
1313
use orml_traits::MultiCurrency;
14-
use polkadot_parachain::primitives::Sibling;
14+
use polkadot_parachain_primitives::primitives::Sibling;
1515

1616
use sp_runtime::{
1717
traits::{AccountIdConversion, BadOrigin, Dispatchable},

‎auction/Cargo.toml

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,32 @@ name = "orml-auction"
33
description = "Auction module that implements `Auction` trait."
44
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/auction"
55
license = "Apache-2.0"
6-
version = "0.4.1-dev"
6+
version = "0.5.0-dev"
77
authors = ["Acala Developers"]
88
edition = "2021"
99

1010
[dependencies]
11-
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
12-
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
13-
serde = { version = "1.0.136", optional = true }
11+
parity-scale-codec = { workspace = true }
12+
scale-info = { workspace = true }
13+
serde = { workspace = true, optional = true }
1414

15-
frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
16-
frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
17-
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
18-
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
15+
frame-support = { workspace = true }
16+
frame-system = { workspace = true }
17+
sp-runtime = { workspace = true }
18+
sp-std = { workspace = true }
1919

20-
orml-traits = { path = "../traits", version = "0.4.1-dev", default-features = false }
20+
orml-traits = { path = "../traits", version = "0.5.0-dev", default-features = false }
2121

2222
[dev-dependencies]
23-
sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
24-
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
23+
sp-core = { workspace = true, features = ["std"] }
24+
sp-io = { workspace = true, features = ["std"] }
2525

2626
[features]
2727
default = ["std"]
2828
std = [
2929
"serde",
3030

31-
"codec/std",
31+
"parity-scale-codec/std",
3232
"frame-support/std",
3333
"frame-system/std",
3434
"orml-traits/std",

‎auction/src/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
#![allow(clippy::string_lit_as_bytes)]
1414
#![allow(clippy::unused_unit)]
1515

16-
use codec::MaxEncodedLen;
1716
use frame_support::pallet_prelude::*;
1817
use frame_system::{ensure_signed, pallet_prelude::*};
1918
use orml_traits::{Auction, AuctionHandler, AuctionInfo, Change};
19+
use parity_scale_codec::MaxEncodedLen;
2020
use sp_runtime::{
2121
traits::{AtLeast32BitUnsigned, Bounded, CheckedAdd, MaybeSerializeDeserialize, Member, One, Zero},
2222
DispatchError, DispatchResult,
@@ -54,8 +54,8 @@ pub mod module {
5454
+ Copy
5555
+ MaybeSerializeDeserialize
5656
+ Bounded
57-
+ codec::FullCodec
58-
+ codec::MaxEncodedLen;
57+
+ parity_scale_codec::FullCodec
58+
+ parity_scale_codec::MaxEncodedLen;
5959

6060
/// The `AuctionHandler` that allow custom bidding logic and handles
6161
/// auction result.

‎authority/Cargo.toml

+13-13
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,34 @@ name = "orml-authority"
33
description = "Utility pallet to perform ROOT calls in a PoA network"
44
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/auction"
55
license = "Apache-2.0"
6-
version = "0.4.1-dev"
6+
version = "0.5.0-dev"
77
authors = ["Acala Developers"]
88
edition = "2021"
99

1010
[dependencies]
11-
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
11+
parity-scale-codec = { workspace = true }
1212
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
1313
serde = { version = "1.0.145", optional = true }
1414

15-
frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
16-
frame-system = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
17-
sp-core = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
18-
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
19-
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
20-
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
15+
frame-support = { workspace = true }
16+
frame-system = { workspace = true }
17+
sp-core = { workspace = true }
18+
sp-io = { workspace = true }
19+
sp-runtime = { workspace = true }
20+
sp-std = { workspace = true }
2121

2222
[dev-dependencies]
23-
pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
24-
pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
25-
pallet-root-testing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
26-
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
23+
pallet-preimage = { workspace = true, features = ["std"] }
24+
pallet-scheduler = { workspace = true, features = ["std"] }
25+
pallet-root-testing = { workspace = true, features = ["std"] }
26+
sp-io = { workspace = true, features = ["std"] }
2727

2828
[features]
2929
default = ["std"]
3030
std = [
3131
"serde",
3232

33-
"codec/std",
33+
"parity-scale-codec/std",
3434
"frame-support/std",
3535
"frame-system/std",
3636
"scale-info/std",

‎authority/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#![allow(clippy::borrowed_box)]
2727
#![allow(clippy::unused_unit)]
2828

29-
use codec::MaxEncodedLen;
3029
use frame_support::{
3130
dispatch::PostDispatchInfo,
3231
dispatch::{DispatchClass, GetDispatchInfo, Pays},
@@ -37,6 +36,7 @@ use frame_support::{
3736
},
3837
};
3938
use frame_system::{pallet_prelude::*, EnsureRoot, EnsureSigned};
39+
use parity_scale_codec::MaxEncodedLen;
4040
use scale_info::TypeInfo;
4141
use sp_core::defer;
4242
use sp_runtime::{

‎authority/src/mock.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
#![cfg(test)]
44

55
use super::*;
6-
use codec::{Decode, Encode};
76
use frame_support::{
87
parameter_types,
98
traits::{ConstU64, EqualPrivilegeOnly, Everything},
109
weights::Weight,
1110
};
1211
use frame_system::{ensure_root, ensure_signed, EnsureRoot};
12+
use parity_scale_codec::{Decode, Encode};
1313
use sp_core::H256;
1414
use sp_runtime::{
1515
traits::{BadOrigin, IdentityLookup},

‎authority/src/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#![cfg(test)]
44

55
use super::*;
6-
use codec::MaxEncodedLen;
76
use frame_support::{
87
assert_noop, assert_ok,
98
dispatch::DispatchErrorWithPostInfo,
@@ -14,6 +13,7 @@ use mock::{
1413
authority, run_to_block, Authority, BlockNumber, ExtBuilder, MockAsOriginId, OriginCaller, Runtime, RuntimeCall,
1514
RuntimeOrigin, System,
1615
};
16+
use parity_scale_codec::MaxEncodedLen;
1717
use sp_io::hashing::blake2_256;
1818
use sp_runtime::{traits::BadOrigin, Perbill};
1919

‎benchmarking/Cargo.toml

+14-14
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@ name = "orml-benchmarking"
33
description = "Provide macro to benchmark Substrate runtime."
44
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/benchmarking"
55
license = "Apache-2.0"
6-
version = "0.4.1-dev"
6+
version = "0.5.0-dev"
77
authors = ["Laminar Developers <[email protected]>"]
88
edition = "2021"
99

1010
[dependencies]
11-
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
12-
log = { version = "0.4.20", default-features = false }
11+
parity-scale-codec = { workspace = true }
12+
log = { workspace = true }
1313
paste = "1.0.7"
1414
scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
15-
serde = { version = "1.0.136", optional = true }
15+
serde = { workspace = true, optional = true }
1616

17-
frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
18-
frame-support = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
19-
sp-api = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
20-
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
21-
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
22-
sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
23-
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
24-
sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "release-polkadot-v1.1.0" }
17+
frame-benchmarking = { workspace = true }
18+
frame-support = { workspace = true }
19+
sp-api = { workspace = true }
20+
sp-io = { workspace = true }
21+
sp-runtime = { workspace = true }
22+
sp-runtime-interface = { workspace = true }
23+
sp-std = { workspace = true }
24+
sp-storage = { workspace = true }
2525

2626
[dev-dependencies]
2727
hex-literal = "0.4.1"
2828

29-
frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
29+
frame-system = { workspace = true, features = ["std"] }
3030

3131
[features]
3232
default = [ "std" ]
3333
std = [
3434
"serde",
3535

36-
"codec/std",
36+
"parity-scale-codec/std",
3737
"frame-benchmarking/std",
3838
"frame-support/std",
3939
"log/std",

‎benchmarking/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
mod tests;
77

8-
#[doc(hidden)]
9-
pub use codec;
108
pub use frame_benchmarking::{
119
benchmarking, whitelisted_caller, BenchmarkBatch, BenchmarkConfig, BenchmarkError, BenchmarkList,
1210
BenchmarkMetadata, BenchmarkParameter, BenchmarkResult, Benchmarking, BenchmarkingSetup,
@@ -18,6 +16,8 @@ pub use frame_support;
1816
#[doc(hidden)]
1917
pub use log;
2018
#[doc(hidden)]
19+
pub use parity_scale_codec;
20+
#[doc(hidden)]
2121
pub use paste;
2222
#[doc(hidden)]
2323
pub use sp_io::storage::root as storage_root;
@@ -291,13 +291,13 @@ macro_rules! benchmarks_iter {
291291
>:: [< new_call_variant_ $dispatch >] (
292292
$($arg),*
293293
);
294-
let __benchmarked_call_encoded = $crate::codec::Encode::encode(
294+
let __benchmarked_call_encoded = $crate::parity_scale_codec::Encode::encode(
295295
&__call
296296
);
297297
}: {
298298
let __call_decoded = <
299299
$pallet::Call::<$runtime $(, $instance )?>
300-
as $crate::codec::Decode
300+
as $crate::parity_scale_codec::Decode
301301
>::decode(&mut &__benchmarked_call_encoded[..])
302302
.expect("call is encoded above, encoding must be correct");
303303
let __origin = $crate::to_origin!($origin $(, $origin_type)?);

‎build-script-utils/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "orml-build-script-utils"
33
description = "Crate with utility functions for `build.rs` scripts."
44
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/build-script-utils"
55
license = "Apache-2.0"
6-
version = "0.4.1-dev"
6+
version = "0.5.0-dev"
77
authors = ["Parity Technologies <[email protected]>", "Laminar Developers <[email protected]>"]
88
edition = "2021"
99

0 commit comments

Comments
 (0)