Skip to content
Snippets Groups Projects
Commit 58d3c43c authored by Éloïs's avatar Éloïs
Browse files

Merge branch '70-upgrade-all-dependencies' into 'dev'

Resolve "Upgrade all dependencies"

Closes #70

See merge request !59
parents 39becabb affb9c62
No related branches found
No related tags found
1 merge request!59Resolve "Upgrade all dependencies"
This diff is collapsed.
......@@ -6,13 +6,9 @@ description = "DUniter-RS (durs) is a new implementation of Duniter protocol and
license = "AGPL-3.0"
[dependencies]
clap = "2.31.2"
duniter-core = { path = "./core" }
duniter-tui = { path = "./tui" }
duniter-ws2p = { path = "./ws2p" }
lazy_static = "1.0.0"
serde_json = "1.0.9"
websocket = "0.20.2"
[features]
# Treat warnings as a build error.
......
......@@ -18,9 +18,9 @@ duniter-module = { path = "../module" }
duniter-network = { path = "../network" }
duniter-wotb = { path = "../wotb" }
log = "0.4.1"
pbr = "1.0.0"
pbr = "1.0.1"
rand = "0.4.2"
serde = "1.0.24"
serde_derive = "1.0.24"
serde_json = "1.0.9"
serde = "1.0.57"
serde_derive = "1.0.57"
serde_json = "1.0.17"
sqlite = "0.23.9"
\ No newline at end of file
......@@ -130,10 +130,11 @@ pub fn sync_ts(
.bind(&[sqlite::Value::Integer(0)])
.expect("Fail to get ts current block !");
let current_ts_blockstamp = if let Some(row) = cursor.next().expect("cursor error") {
let block_id = BlockId(row[1]
.as_integer()
.expect("Fail to parse current ts blockstamp !")
as u32);
let block_id = BlockId(
row[1]
.as_integer()
.expect("Fail to parse current ts blockstamp !") as u32,
);
let block_hash = BlockHash(
Hash::from_hex(
row[0]
......
......@@ -10,9 +10,9 @@ path = "lib.rs"
[dependencies]
rand = "0.4.2"
serde = "1.0.24"
serde_derive = "1.0.24"
serde_json = "1.0.9"
serde = "1.0.57"
serde_derive = "1.0.57"
serde_json = "1.0.17"
duniter-crypto = { path = "../crypto" }
duniter-module = { path = "../module" }
......
......@@ -18,12 +18,12 @@ duniter-module = { path = "../module" }
lazy_static = "1.0.0"
log = "0.4.1"
rand = "0.4.2"
regex = "0.2.6"
regex = "1.0.0"
rust-crypto = "0.2.36"
serde = "1.0.24"
serde_derive = "1.0.24"
serde_json = "1.0.9"
simplelog = "0.5.1"
serde = "1.0.57"
serde_derive = "1.0.57"
serde_json = "1.0.17"
simplelog = "0.5.2"
sqlite = "0.23.9"
threadpool = "1.7.1"
......
......@@ -13,9 +13,9 @@ path = "lib.rs"
[dependencies]
base58 = "0.1.0"
base64 = "0.8.0"
base64 = "0.9.1"
rust-crypto = "0.2.36"
serde = "1.0.24"
serde = "1.0.57"
[features]
# Treat warnings as a build error.
......
......@@ -18,12 +18,11 @@ lazy_static = "1.0.0"
log = "0.4.1"
rand = "0.4.2"
rust-crypto = "0.2.36"
regex = "0.2.6"
regex = "1.0.0"
sqlite = "0.23.9"
serde = "1.0.24"
serde_derive = "1.0.24"
serde_json = "1.0.9"
websocket = "0.20.2"
serde = "1.0.57"
serde_derive = "1.0.57"
serde_json = "1.0.17"
[features]
exp = []
......
......@@ -44,10 +44,11 @@ pub fn blockstamp_to_timestamp(blockstamp: &Blockstamp, db: &DuniterDB) -> Optio
.next()
.expect("convert blockstamp to timestamp failure at step 2 !")
{
return Some(row[0]
.as_integer()
.expect("convert blockstamp to timestamp failure at step 3 !")
as u64);
return Some(
row[0]
.as_integer()
.expect("convert blockstamp to timestamp failure at step 3 !") as u64,
);
}
None
}
......@@ -298,10 +299,12 @@ impl DALBlock {
},
block: BlockDocument {
nonce,
number: BlockId(row[3]
.as_integer()
.expect("dal::get_block() : fail to parse number !")
as u32),
number: BlockId(
row[3]
.as_integer()
.expect("dal::get_block() : fail to parse number !")
as u32,
),
pow_min: row[4]
.as_integer()
.expect("dal::get_block() : fail to parse pow min !")
......
......@@ -13,13 +13,13 @@ path = "lib.rs"
[dependencies]
base58 = "0.1.0"
base64 = "0.8.0"
base64 = "0.9.1"
duniter-crypto = { path = "../crypto" }
lazy_static = "1.0.0"
linked-hash-map = "0.5.0"
regex = "0.2"
linked-hash-map = "0.5.1"
regex = "1.0.0"
rust-crypto = "0.2.36"
serde = "1.0.24"
serde = "1.0.57"
[features]
# Treat warnings as a build error.
......
......@@ -14,9 +14,9 @@ duniter-dal = { path = "../dal" }
duniter-documents = { path = "../documents" }
duniter-module = { path = "../module" }
duniter-network = { path = "../network" }
serde = "1.0.24"
serde_derive = "1.0.24"
serde_json = "1.0.9"
serde = "1.0.57"
serde_derive = "1.0.57"
serde_json = "1.0.17"
[features]
# Treat warnings as a build error.
......
......@@ -11,9 +11,9 @@ path = "lib.rs"
[dependencies]
duniter-crypto = { path = "../crypto" }
duniter-documents = { path = "../documents" }
serde = "1.0.24"
serde_derive = "1.0.24"
serde_json = "1.0.9"
serde = "1.0.57"
serde_derive = "1.0.57"
serde_json = "1.0.17"
[features]
# Treat warnings as a build error.
......
......@@ -13,11 +13,11 @@ duniter-crypto = { path = "../crypto" }
duniter-documents = { path = "../documents" }
duniter-module = { path = "../module" }
lazy_static = "1.0.0"
regex = "0.2.6"
regex = "1.0.0"
rust-crypto = "0.2.36"
serde = "1.0.24"
serde_derive = "1.0.24"
serde_json = "1.0.9"
serde = "1.0.57"
serde_derive = "1.0.57"
serde_json = "1.0.17"
[features]
# Treat warnings as a build error.
......
......@@ -17,7 +17,7 @@ duniter-message = { path = "../message" }
duniter-module = { path = "../module" }
duniter-network = { path = "../network" }
log = "0.4.1"
serde_json = "1.0.9"
serde_json = "1.0.17"
termion = "1.5.1"
[features]
......
......@@ -12,11 +12,11 @@ license = "AGPL-3.0"
path = "lib.rs"
[dependencies]
serde = "1.0.24"
serde_derive = "1.0.24"
serde = "1.0.57"
serde_derive = "1.0.57"
bincode = "0.9.2"
byteorder = "1.2.1"
rayon = "1.0.0"
byteorder = "1.2.3"
rayon = "1.0.1"
[features]
# Treat warnings as a build error.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment