Skip to content

Commit

Permalink
Remove old 'time'. (#1472)
Browse files Browse the repository at this point in the history
* Remove old 'time'.

* cargo fmt

---------

Co-authored-by: Adam Dossa <adam.dossa@gmail.com>
  • Loading branch information
Neopallium and adamdossa committed Jun 20, 2023
1 parent 6613d0d commit de418e9
Show file tree
Hide file tree
Showing 8 changed files with 213 additions and 349 deletions.
511 changes: 197 additions & 314 deletions Cargo.lock

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ substrate-frame-rpc-system = { git = "https://github.com/PolymeshAssociation/sub
substrate-state-trie-migration-rpc = { git = "https://github.com/PolymeshAssociation/substrate", branch = "polymesh-v6-monthly-2023-03" }
substrate-prometheus-endpoint = { git = "https://github.com/PolymeshAssociation/substrate", branch = "polymesh-v6-monthly-2023-03" }
substrate-test-runtime-client = { git = "https://github.com/PolymeshAssociation/substrate", branch = "polymesh-v6-monthly-2023-03" }
substrate-build-script-utils = { git = "https://github.com/PolymeshAssociation/substrate", branch = "polymesh-v6-monthly-2023-03" }
substrate-test-utils = { git = "https://github.com/PolymeshAssociation/substrate", branch = "polymesh-v6-monthly-2023-03" }
substrate-test-utils-derive = { git = "https://github.com/PolymeshAssociation/substrate", branch = "polymesh-v6-monthly-2023-03" }
substrate-wasm-builder = { git = "https://github.com/PolymeshAssociation/substrate", branch = "polymesh-v6-monthly-2023-03" }
Expand Down Expand Up @@ -198,7 +199,7 @@ polymesh-runtime-mainnet = { path = "pallets/runtime/mainnet" }
polymesh-runtime-testnet = { path = "pallets/runtime/testnet" }

# General
chrono = "0.4.11"
chrono = { version = "0.4", default-features = false }
ed25519-dalek = "1.0.0"
futures = "0.3.21"
jsonrpsee = { version = "0.16.2", features = ["server"] }
Expand Down Expand Up @@ -261,7 +262,7 @@ frame-benchmarking = "4.0.0-dev"
frame-benchmarking-cli = "4.0.0-dev"

[build-dependencies]
vergen = "3.1.0"
substrate-build-script-utils = { version = "3.0.0" }

[features]
default = ["std"]
Expand Down
10 changes: 5 additions & 5 deletions bin/bench/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@ serde = "1.0.101"
serde_json = "1.0.41"
clap = { version = "3.1.6", features = ["derive"] }
derive_more = "0.99.2"
kvdb = "0.12"
kvdb-rocksdb = "0.16.0"
kvdb = "0.13"
kvdb-rocksdb = "0.17.0"
sp-trie = { version = "7.0.0" }
sp-core = { version = "7.0.0" }
sp-consensus = { version = "0.10.0-dev" }
sp-transaction-pool = { version = "4.0.0-dev" }
sc-basic-authorship = { version = "0.10.0-dev" }
sp-inherents = { version = "4.0.0-dev" }
sp-timestamp = { version = "4.0.0-dev" }
sp-tracing = { version = "5.0.0" }
hash-db = "0.15.2"
sp-tracing = { version = "6.0.0" }
hash-db = "0.16"
tempfile = "3.1.0"
fs_extra = "1"
hex = "0.4.0"
rand = { version = "0.8", features = ["small_rng"] }
lazy_static = "1.4.0"
parity-util-mem = { version = "0.12.0", default-features = false, features = ["primitive-types"] }
parity-db = { version = "0.3.16" }
parity-db = { version = "0.4" }
sc-transaction-pool = { version = "4.0.0-dev" }
futures = { version = "0.3.4", features = ["thread-pool"] }
2 changes: 1 addition & 1 deletion bin/executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ sp-core = { version = "7.0.0" }
sp-io = { version = "7.0.0" }
sp-state-machine = { version = "0.13.0" }
sp-trie = { version = "7.0.0" }
trie-root = "0.16.0"
trie-root = "0.18.0"
frame-benchmarking = { version = "4.0.0-dev" }

[dev-dependencies]
Expand Down
26 changes: 3 additions & 23 deletions build.rs
Original file line number Diff line number Diff line change
@@ -1,27 +1,7 @@
use std::{env, path::PathBuf};

use vergen::{generate_cargo_keys, ConstantsFlags};

const ERROR_MSG: &str = "Failed to generate metadata files";
use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};

fn main() {
generate_cargo_keys(ConstantsFlags::SHA_SHORT).expect(ERROR_MSG);

let mut manifest_dir = PathBuf::from(
env::var("CARGO_MANIFEST_DIR").expect("`CARGO_MANIFEST_DIR` is always set by cargo."),
);

while manifest_dir.parent().is_some() {
if manifest_dir.join(".git/HEAD").exists() {
println!(
"cargo:rerun-if-changed={}",
manifest_dir.join(".git/HEAD").display()
);
return;
}

manifest_dir.pop();
}
generate_cargo_keys();

println!("cargo:warning=Could not find `.git/HEAD` from manifest dir!");
rerun_if_git_head_changed();
}
4 changes: 2 additions & 2 deletions pallets/runtime/tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ polymesh-exec-macro = { path = "exec_macro" }
# General
serde = { version = "1.0.104", default-features = false }
rand = { version = "0.7.3", default-features = false }
chrono = "0.4"
chrono = { version = "0.4", default-features = false }
hex-literal = "0.3.0"
smallvec = "1.4.1"
lazy_static = "1.4.0"
Expand Down Expand Up @@ -108,7 +108,7 @@ substrate-test-utils = { version = "4.0.0-dev", optional = true }
[dev-dependencies]
libsecp256k1 = { version = "0.7", default-features = false }
wat = "1.0"
sp-tracing = { version = "5.0.0", default-features = false }
sp-tracing = { version = "6.0.0", default-features = false }

[features]
default = ["std", "equalize"]
Expand Down
2 changes: 1 addition & 1 deletion pallets/staking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ rand_chacha = { version = "0.2", default-features = false, optional = true }

[dev-dependencies]
pallet-staking-reward-curve = { version = "4.0.0-dev", default-features = false }
sp-tracing = "5.0.0"
sp-tracing = "6.0.0"

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = "Polymesh Primitives"
edition = "2021"

[dependencies]
chrono = {version = "0.4.18", default-features = false }
chrono = { version = "0.4", default-features = false }
serde = { version = "1.0.104", optional = true, default-features = false, features = ["derive"] }
rand_core = { version = "0.6", default-features = false }
rand = { version = "0.8", default-features = false, optional = true }
Expand Down

0 comments on commit de418e9

Please sign in to comment.