Skip to content

Commit 633d0f6

Browse files
committed
chore(cargo): update crate versions to 1.7.0
1 parent cebeaad commit 633d0f6

File tree

8 files changed

+37
-28
lines changed

8 files changed

+37
-28
lines changed

Cargo.lock

100644100755
Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "witnet"
3-
version = "1.6.8"
3+
version = "1.7.0"
44
authors = ["Witnet Foundation <info@witnet.foundation>"]
55
publish = false
66
repository = "witnet/witnet-rust"

bridges/centralized-ethereum/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "witnet-centralized-ethereum-bridge"
3-
version = "1.6.8"
3+
version = "1.7.0"
44
authors = ["Witnet Foundation <info@witnet.foundation>"]
55
edition = "2018"
66

data_structures/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ authors = ["Witnet Foundation <info@witnet.foundation>"]
33
description = "data structures component"
44
edition = "2021"
55
name = "witnet_data_structures"
6-
version = "1.6.8"
6+
version = "1.7.0"
77
workspace = ".."
88

99
[features]

node/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "witnet_node"
3-
version = "1.6.8"
3+
version = "1.7.0"
44
authors = ["Witnet Foundation <info@witnet.foundation>"]
55
workspace = ".."
66
description = "node component"

node/src/signature_mngr.rs

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -497,12 +497,16 @@ impl Actor for SignatureManagerAdapter {
497497

498498
async move {
499499
let config = config_mngr::get().await?;
500-
let master_key_from_file = if let Some(master_key_path) = &config.storage.master_key_import_path {
501-
master_key_import_from_file(master_key_path).map(Some)
502-
} else {
503-
Ok(None)
504-
}?;
505-
let master_key_from_storage: Option<ExtendedSK> = storage_mngr::get::<_, ExtendedSecretKey>(&MASTER_KEY).await?.map(Into::into);
500+
let master_key_from_file =
501+
if let Some(master_key_path) = &config.storage.master_key_import_path {
502+
master_key_import_from_file(master_key_path).map(Some)
503+
} else {
504+
Ok(None)
505+
}?;
506+
let master_key_from_storage: Option<ExtendedSK> =
507+
storage_mngr::get::<_, ExtendedSecretKey>(&MASTER_KEY)
508+
.await?
509+
.map(Into::into);
506510

507511
let master_key = match (master_key_from_file, master_key_from_storage) {
508512
// Didn't ask to import master key and no master key in storage:
@@ -513,23 +517,28 @@ impl Actor for SignatureManagerAdapter {
513517
(None, Some(from_storage)) => Ok(from_storage),
514518
(Some(from_file), None) => {
515519
// Save the key into the storage
516-
persist_master_key(from_file.clone()).await.map(|()| from_file)
517-
},
520+
persist_master_key(from_file.clone())
521+
.await
522+
.map(|()| from_file)
523+
}
518524
// There is a master key in storage and imported:
519525
(Some(from_file), Some(_from_storage)) => {
520526
// Save the key into the storage
521-
persist_master_key(from_file.clone()).await.map(|()| from_file.clone())
527+
persist_master_key(from_file.clone())
528+
.await
529+
.map(|()| from_file.clone())
522530
}
523531
}?;
524532

525533
crypto.send(SetKey(master_key)).await?
526-
}.into_actor(self)
527-
.map_err(|err, _act, _ctx| {
528-
log::error!("Failed to configure master key: {}", err);
529-
System::current().stop_with_code(1);
530-
})
531-
.map(|_res: Result<(), ()>, _act, _ctx| ())
532-
.wait(ctx);
534+
}
535+
.into_actor(self)
536+
.map_err(|err, _act, _ctx| {
537+
log::error!("Failed to configure master key: {}", err);
538+
System::current().stop_with_code(1);
539+
})
540+
.map(|_res: Result<(), ()>, _act, _ctx| ())
541+
.wait(ctx);
533542

534543
let crypto = self.crypto.clone();
535544
async move {

toolkit/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "witnet_toolkit"
3-
version = "1.6.8"
3+
version = "1.7.0"
44
authors = ["Adán SDPC <adan.sdpc@gmail.com>"]
55
edition = "2021"
66

wallet/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
authors = ["Witnet Foundation <info@witnet.foundation>"]
33
edition = "2021"
44
name = "witnet_wallet"
5-
version = "1.6.8"
5+
version = "1.7.0"
66
workspace = ".."
77

88
[dependencies]

0 commit comments

Comments
 (0)