Skip to content

Commit

Permalink
updats to warnings, cargo.lock, version number (#3739)
Browse files Browse the repository at this point in the history
  • Loading branch information
@yeastplume
yeastplume authored Oct 21, 2022
1 parent 34d23f5 commit 684f0a3
Show file tree
Hide file tree
Showing 16 changed files with 461 additions and 301 deletions.
619 changes: 390 additions & 229 deletions Cargo.lock
View file

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin"
version = "5.2.0-alpha.1"
version = "5.2.0-alpha.2"
authors = ["Grin Developers <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand Down Expand Up @@ -32,14 +32,14 @@ serde_json = "1"
log = "0.4"
term = "0.6"

grin_api = { path = "./api", version = "5.2.0-alpha.1" }
grin_config = { path = "./config", version = "5.2.0-alpha.1" }
grin_chain = { path = "./chain", version = "5.2.0-alpha.1" }
grin_core = { path = "./core", version = "5.2.0-alpha.1" }
grin_keychain = { path = "./keychain", version = "5.2.0-alpha.1" }
grin_p2p = { path = "./p2p", version = "5.2.0-alpha.1" }
grin_servers = { path = "./servers", version = "5.2.0-alpha.1" }
grin_util = { path = "./util", version = "5.2.0-alpha.1" }
grin_api = { path = "./api", version = "5.2.0-alpha.2" }
grin_config = { path = "./config", version = "5.2.0-alpha.2" }
grin_chain = { path = "./chain", version = "5.2.0-alpha.2" }
grin_core = { path = "./core", version = "5.2.0-alpha.2" }
grin_keychain = { path = "./keychain", version = "5.2.0-alpha.2" }
grin_p2p = { path = "./p2p", version = "5.2.0-alpha.2" }
grin_servers = { path = "./servers", version = "5.2.0-alpha.2" }
grin_util = { path = "./util", version = "5.2.0-alpha.2" }

[dependencies.cursive]
version = "0.16"
Expand All @@ -50,5 +50,5 @@ features = ["pancurses-backend"]
built = { version = "0.4", features = ["git2"]}

[dev-dependencies]
grin_chain = { path = "./chain", version = "5.2.0-alpha.1" }
grin_store = { path = "./store", version = "5.2.0-alpha.1" }
grin_chain = { path = "./chain", version = "5.2.0-alpha.2" }
grin_store = { path = "./store", version = "5.2.0-alpha.2" }
14 changes: 7 additions & 7 deletions api/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_api"
version = "5.2.0-alpha.1"
version = "5.2.0-alpha.2"
authors = ["Grin Developers <[email protected]>"]
description = "APIs for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand Down Expand Up @@ -30,9 +30,9 @@ rustls = "0.17"
url = "2.1"
bytes = "0.5"

grin_core = { path = "../core", version = "5.2.0-alpha.1" }
grin_chain = { path = "../chain", version = "5.2.0-alpha.1" }
grin_p2p = { path = "../p2p", version = "5.2.0-alpha.1" }
grin_pool = { path = "../pool", version = "5.2.0-alpha.1" }
grin_store = { path = "../store", version = "5.2.0-alpha.1" }
grin_util = { path = "../util", version = "5.2.0-alpha.1" }
grin_core = { path = "../core", version = "5.2.0-alpha.2" }
grin_chain = { path = "../chain", version = "5.2.0-alpha.2" }
grin_p2p = { path = "../p2p", version = "5.2.0-alpha.2" }
grin_pool = { path = "../pool", version = "5.2.0-alpha.2" }
grin_store = { path = "../store", version = "5.2.0-alpha.2" }
grin_util = { path = "../util", version = "5.2.0-alpha.2" }
10 changes: 5 additions & 5 deletions chain/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_chain"
version = "5.2.0-alpha.1"
version = "5.2.0-alpha.2"
authors = ["Grin Developers <[email protected]>"]
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand All @@ -23,10 +23,10 @@ chrono = "0.4.11"
lru-cache = "0.1"
lazy_static = "1"

grin_core = { path = "../core", version = "5.2.0-alpha.1" }
grin_keychain = { path = "../keychain", version = "5.2.0-alpha.1" }
grin_store = { path = "../store", version = "5.2.0-alpha.1" }
grin_util = { path = "../util", version = "5.2.0-alpha.1" }
grin_core = { path = "../core", version = "5.2.0-alpha.2" }
grin_keychain = { path = "../keychain", version = "5.2.0-alpha.2" }
grin_store = { path = "../store", version = "5.2.0-alpha.2" }
grin_util = { path = "../util", version = "5.2.0-alpha.2" }

[dev-dependencies]
env_logger = "0.7"
Expand Down
10 changes: 5 additions & 5 deletions config/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_config"
version = "5.2.0-alpha.1"
version = "5.2.0-alpha.2"
authors = ["Grin Developers <[email protected]>"]
description = "Configuration for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand All @@ -16,10 +16,10 @@ serde_derive = "1"
toml = "0.5"
dirs = "2.0"

grin_core = { path = "../core", version = "5.2.0-alpha.1" }
grin_servers = { path = "../servers", version = "5.2.0-alpha.1" }
grin_p2p = { path = "../p2p", version = "5.2.0-alpha.1" }
grin_util = { path = "../util", version = "5.2.0-alpha.1" }
grin_core = { path = "../core", version = "5.2.0-alpha.2" }
grin_servers = { path = "../servers", version = "5.2.0-alpha.2" }
grin_p2p = { path = "../p2p", version = "5.2.0-alpha.2" }
grin_util = { path = "../util", version = "5.2.0-alpha.2" }

[dev-dependencies]
pretty_assertions = "0.6.1"
6 changes: 3 additions & 3 deletions core/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_core"
version = "5.2.0-alpha.1"
version = "5.2.0-alpha.2"
authors = ["Grin Developers <[email protected]>"]
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand Down Expand Up @@ -28,8 +28,8 @@ chrono = { version = "0.4.11", features = ["serde"] }
zeroize = { version = "1.1", features =["zeroize_derive"] }
bytes = "0.5"

keychain = { package = "grin_keychain", path = "../keychain", version = "5.2.0-alpha.1" }
util = { package = "grin_util", path = "../util", version = "5.2.0-alpha.1" }
keychain = { package = "grin_keychain", path = "../keychain", version = "5.2.0-alpha.2" }
util = { package = "grin_util", path = "../util", version = "5.2.0-alpha.2" }

[dev-dependencies]
serde_json = "1"
6 changes: 3 additions & 3 deletions core/fuzz/Cargo.lock
View file

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

5 changes: 2 additions & 3 deletions core/src/core/block.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ use crate::pow::{verify_size, Difficulty, Proof, ProofOfWork};
use crate::ser::{
self, deserialize_default, serialize_default, PMMRable, Readable, Reader, Writeable, Writer,
};
use chrono::naive::{MAX_DATE, MIN_DATE};
use chrono::prelude::{DateTime, NaiveDateTime, Utc};
use chrono::Duration;
use keychain::{self, BlindingFactor};
Expand Down Expand Up @@ -289,8 +288,8 @@ fn read_block_header<R: Reader>(reader: &mut R) -> Result<BlockHeader, ser::Erro
let (output_mmr_size, kernel_mmr_size) = ser_multiread!(reader, read_u64, read_u64);
let pow = ProofOfWork::read(reader)?;

if timestamp > MAX_DATE.and_hms(0, 0, 0).timestamp()
|| timestamp < MIN_DATE.and_hms(0, 0, 0).timestamp()
if timestamp > chrono::NaiveDate::MAX.and_hms(0, 0, 0).timestamp()
|| timestamp < chrono::NaiveDate::MIN.and_hms(0, 0, 0).timestamp()
{
return Err(ser::Error::CorruptedData);
}
Expand Down
4 changes: 2 additions & 2 deletions keychain/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_keychain"
version = "5.2.0-alpha.1"
version = "5.2.0-alpha.2"
authors = ["Grin Developers <[email protected]>"]
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand All @@ -26,4 +26,4 @@ ripemd160 = "0.9"
sha2 = "0.9"
pbkdf2 = "0.8"

grin_util = { path = "../util", version = "5.2.0-alpha.1" }
grin_util = { path = "../util", version = "5.2.0-alpha.2" }
12 changes: 6 additions & 6 deletions p2p/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_p2p"
version = "5.2.0-alpha.1"
version = "5.2.0-alpha.2"
authors = ["Grin Developers <[email protected]>"]
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand All @@ -22,10 +22,10 @@ log = "0.4"
chrono = { version = "0.4.11", features = ["serde"] }
bytes = "0.5"

grin_core = { path = "../core", version = "5.2.0-alpha.1" }
grin_store = { path = "../store", version = "5.2.0-alpha.1" }
grin_util = { path = "../util", version = "5.2.0-alpha.1" }
grin_chain = { path = "../chain", version = "5.2.0-alpha.1" }
grin_core = { path = "../core", version = "5.2.0-alpha.2" }
grin_store = { path = "../store", version = "5.2.0-alpha.2" }
grin_util = { path = "../util", version = "5.2.0-alpha.2" }
grin_chain = { path = "../chain", version = "5.2.0-alpha.2" }

[dev-dependencies]
grin_pool = { path = "../pool", version = "5.2.0-alpha.1" }
grin_pool = { path = "../pool", version = "5.2.0-alpha.2" }
10 changes: 5 additions & 5 deletions pool/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_pool"
version = "5.2.0-alpha.1"
version = "5.2.0-alpha.2"
authors = ["Grin Developers <[email protected]>"]
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand All @@ -18,9 +18,9 @@ thiserror = "1"
log = "0.4"
chrono = "0.4.11"

grin_core = { path = "../core", version = "5.2.0-alpha.1" }
grin_keychain = { path = "../keychain", version = "5.2.0-alpha.1" }
grin_util = { path = "../util", version = "5.2.0-alpha.1" }
grin_core = { path = "../core", version = "5.2.0-alpha.2" }
grin_keychain = { path = "../keychain", version = "5.2.0-alpha.2" }
grin_util = { path = "../util", version = "5.2.0-alpha.2" }

[dev-dependencies]
grin_chain = { path = "../chain", version = "5.2.0-alpha.1" }
grin_chain = { path = "../chain", version = "5.2.0-alpha.2" }
12 changes: 6 additions & 6 deletions pool/fuzz/Cargo.lock
View file

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

18 changes: 9 additions & 9 deletions servers/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_servers"
version = "5.2.0-alpha.1"
version = "5.2.0-alpha.2"
authors = ["Grin Developers <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand All @@ -26,11 +26,11 @@ tokio = {version = "0.2", features = ["full"] }
tokio-util = { version = "0.2", features = ["codec"] }
walkdir = "2.3.1"

grin_api = { path = "../api", version = "5.2.0-alpha.1" }
grin_chain = { path = "../chain", version = "5.2.0-alpha.1" }
grin_core = { path = "../core", version = "5.2.0-alpha.1" }
grin_keychain = { path = "../keychain", version = "5.2.0-alpha.1" }
grin_p2p = { path = "../p2p", version = "5.2.0-alpha.1" }
grin_pool = { path = "../pool", version = "5.2.0-alpha.1" }
grin_store = { path = "../store", version = "5.2.0-alpha.1" }
grin_util = { path = "../util", version = "5.2.0-alpha.1" }
grin_api = { path = "../api", version = "5.2.0-alpha.2" }
grin_chain = { path = "../chain", version = "5.2.0-alpha.2" }
grin_core = { path = "../core", version = "5.2.0-alpha.2" }
grin_keychain = { path = "../keychain", version = "5.2.0-alpha.2" }
grin_p2p = { path = "../p2p", version = "5.2.0-alpha.2" }
grin_pool = { path = "../pool", version = "5.2.0-alpha.2" }
grin_store = { path = "../store", version = "5.2.0-alpha.2" }
grin_util = { path = "../util", version = "5.2.0-alpha.2" }
6 changes: 3 additions & 3 deletions servers/src/grin/seed.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
//! list of DNS records (the default).
use chrono::prelude::{DateTime, Utc};
use chrono::{Duration, MIN_DATE};
use chrono::Duration;
use p2p::{msg::PeerAddrs, P2PConfig};
use rand::prelude::*;
use std::collections::HashMap;
Expand Down Expand Up @@ -69,8 +69,8 @@ pub fn connect_and_monitor(
// check seeds first
connect_to_seeds_and_peers(peers.clone(), tx.clone(), seed_list, config);

let mut prev = MIN_DATE.and_hms(0, 0, 0);
let mut prev_expire_check = MIN_DATE.and_hms(0, 0, 0);
let mut prev = chrono::Date::<Utc>::MIN_UTC.and_hms(0, 0, 0);
let mut prev_expire_check = chrono::Date::<Utc>::MIN_UTC.and_hms(0, 0, 0);
let mut prev_ping = Utc::now();
let mut start_attempt = 0;
let mut connecting_history: HashMap<PeerAddr, DateTime<Utc>> = HashMap::new();
Expand Down
6 changes: 3 additions & 3 deletions store/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_store"
version = "5.2.0-alpha.1"
version = "5.2.0-alpha.2"
authors = ["Grin Developers <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand All @@ -21,8 +21,8 @@ serde_derive = "1"
thiserror = "1"
log = "0.4"

grin_core = { path = "../core", version = "5.2.0-alpha.1" }
grin_util = { path = "../util", version = "5.2.0-alpha.1" }
grin_core = { path = "../core", version = "5.2.0-alpha.2" }
grin_util = { path = "../util", version = "5.2.0-alpha.2" }

[dev-dependencies]
chrono = "0.4.11"
Expand Down
2 changes: 1 addition & 1 deletion util/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_util"
version = "5.2.0-alpha.1"
version = "5.2.0-alpha.2"
authors = ["Grin Developers <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand Down

0 comments on commit 684f0a3

Please sign in to comment.