Skip to content
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

Jump to bottom

Update versions, unify them, and similar #1126

Merged
merged 5 commits into from
Aug 2, 2023
Merged

Update versions, unify them, and similar #1126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1cd19c8
Fix version specification and unify it
TheQuantumPhysicist Aug 2, 2023
7cf44c0
Run cargo update
TheQuantumPhysicist Aug 2, 2023
a72a1f9
Fix test of wallet to use CARGO_PKG_VERSION for result
TheQuantumPhysicist Aug 2, 2023
2d0c922
Update a few crates to the latest version in Cargo.toml
TheQuantumPhysicist Aug 2, 2023
31891b8
Update fallible iterator
TheQuantumPhysicist Aug 2, 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
1,294 changes: 660 additions & 634 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ homepage = "https://mintlayer.org"
repository = "https://github.com/mintlayer/mintlayer-core"
readme = "README.md"
license = "MIT"
version = "0.1.0"
version = "0.1.1"
authors = ["Samer Afach <samer.afach@mintlayer.org>", "Ben Marsh <benjamin.marsh@mintlayer.org>", "Enrico Rubboli <enrico.rubboli@mintlayer.org>"]
edition = "2021"

Expand Down Expand Up @@ -96,7 +96,7 @@ utxo = { path = "utxo"}
[workspace.package]
edition = "2021"
rust-version = "1.67"
version = "0.1.0"
version = "0.1.1"
license = "MIT"

[workspace.dependencies]
Expand All @@ -115,14 +115,14 @@ cfg-if = "1.0"
chacha20poly1305 = "0.10"
chrono = "0.4"
clap = "4"
criterion = "0.4"
criterion = "0.5"
crossterm = "0.26"
derive_more = "0.99"
directories = "5.0"
enum-iterator = "1.4"
env_logger = "0.10"
expect-test = "1.3"
fallible-iterator = "0.2"
fallible-iterator = "0.3"
fixed-hash = "0.8"
flate2 = "1.0"
fs4 = "0.6"
Expand All @@ -136,15 +136,15 @@ hyper = "0.14"
iced = "0.9"
iced_aw = "0.5"
iced_lazy = "0.6"
itertools = "0.10"
itertools = "0.11"
jsonrpsee = "0.17"
lazy_static = "1.4"
libtest-mimic = "0.6"
log = "0.4"
loom = "0.5"
loom = "0.6"
mockall = "0.11"
num = "0.4"
num-derive = "0.3"
num-derive = "0.4"
num-traits = "0.2"
once_cell = "1.13"
oneshot = "0.1"
Expand All @@ -158,12 +158,12 @@ qrcodegen = "1.8"
quote = "1.0"
rand = "0.8"
rand_chacha = "0.3"
reedline = "0.19"
reedline = "0.22"
replace_with = "0.1"
rfd = { version = "0.11", default-features = false }
ripemd = "0.1"
rlimit = "0.9"
rstest = "0.17"
rlimit = "0.10"
rstest = "0.18"
rusqlite = "0.29"
schnorrkel = "0.10"
serde = "1.0"
Expand Down
6 changes: 4 additions & 2 deletions test-rpc-functions/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[package]
name = "test-rpc-functions"
version = "0.1.0"
edition = "2021"
license.workspace = true
edition.workspace = true
version.workspace = true
rust-version.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
6 changes: 4 additions & 2 deletions wallet/wallet-cli-lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[package]
name = "wallet-cli-lib"
version = "0.1.0"
edition = "2021"
license.workspace = true
edition.workspace = true
version.workspace = true
rust-version.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
2 changes: 1 addition & 1 deletion wallet/wallet-cli-lib/tests/basic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ async fn wallet_cli_basic(#[case] seed: Seed) {
let test = CliTestFramework::setup(&mut rng).await;

let output = test.run(&["nodeversion"]).await;
assert_eq!(output, vec!["0.1.0"]);
assert_eq!(output, vec![env!("CARGO_PKG_VERSION")]);

let output = test.run(&["bestblockheight"]).await;
assert_eq!(output, vec!["0"]);
Expand Down
6 changes: 4 additions & 2 deletions wallet/wallet-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[package]
name = "wallet-cli"
version = "0.1.0"
edition = "2021"
license.workspace = true
edition.workspace = true
version.workspace = true
rust-version.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
6 changes: 4 additions & 2 deletions wallet/wallet-controller/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[package]
name = "wallet-controller"
version = "0.1.0"
edition = "2021"
license.workspace = true
edition.workspace = true
version.workspace = true
rust-version.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
6 changes: 4 additions & 2 deletions wallet/wallet-node-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[package]
name = "node-comm"
version = "0.1.0"
edition = "2021"
license.workspace = true
edition.workspace = true
version.workspace = true
rust-version.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
Loading