Finish updating to the latest Rust/handle broken cargo update

This commit is contained in:
Luke Parker 2023-04-01 05:44:18 -04:00
parent 3f4bab7f7b
commit 648d237df5
No known key found for this signature in database
3 changed files with 12 additions and 12 deletions

19
Cargo.lock generated
View file

@ -1652,9 +1652,9 @@ dependencies = [
[[package]] [[package]]
name = "curve25519-dalek" name = "curve25519-dalek"
version = "4.0.0-rc.2" version = "4.0.0-pre.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03d928d978dbec61a1167414f5ec534f24bea0d7a0d24dd9b6233d3d8223e585" checksum = "67bc65846be335cb20f4e52d49a437b773a2c1fdb42b19fc84e79e6f6771536f"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"fiat-crypto", "fiat-crypto",
@ -2771,9 +2771,9 @@ dependencies = [
[[package]] [[package]]
name = "fiat-crypto" name = "fiat-crypto"
version = "0.1.19" version = "0.1.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93ace6ec7cc19c8ed33a32eaa9ea692d7faea05006b5356b9e2b668ec4bc3955" checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
[[package]] [[package]]
name = "file-per-thread-logger" name = "file-per-thread-logger"
@ -9099,7 +9099,7 @@ dependencies = [
"aes-gcm 0.9.4", "aes-gcm 0.9.4",
"blake2", "blake2",
"chacha20poly1305", "chacha20poly1305",
"curve25519-dalek 4.0.0-rc.2", "curve25519-dalek 4.0.0-pre.5",
"rand_core 0.6.4", "rand_core 0.6.4",
"ring", "ring",
"rustc_version", "rustc_version",
@ -11540,7 +11540,7 @@ dependencies = [
"tokio", "tokio",
"webpki 0.21.4", "webpki 0.21.4",
"webrtc-util", "webrtc-util",
"x25519-dalek 2.0.0-rc.2", "x25519-dalek 2.0.0-pre.1",
"x509-parser 0.13.2", "x509-parser 0.13.2",
] ]
@ -11909,13 +11909,12 @@ dependencies = [
[[package]] [[package]]
name = "x25519-dalek" name = "x25519-dalek"
version = "2.0.0-rc.2" version = "2.0.0-pre.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fabd6e16dd08033932fc3265ad4510cc2eab24656058a6dcb107ffe274abcc95" checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df"
dependencies = [ dependencies = [
"curve25519-dalek 4.0.0-rc.2", "curve25519-dalek 3.2.0",
"rand_core 0.6.4", "rand_core 0.6.4",
"serde",
"zeroize", "zeroize",
] ]

View file

@ -87,7 +87,7 @@ impl Rpc {
pub fn new(mut url: String) -> Result<Rpc, RpcError> { pub fn new(mut url: String) -> Result<Rpc, RpcError> {
// Parse out the username and password // Parse out the username and password
let userpass = if url.contains('@') { let userpass = if url.contains('@') {
let url_clone = url.clone(); let url_clone = url;
let split_url = url_clone.split('@').collect::<Vec<_>>(); let split_url = url_clone.split('@').collect::<Vec<_>>();
if split_url.len() != 2 { if split_url.len() != 2 {
Err(RpcError::InvalidNode)?; Err(RpcError::InvalidNode)?;

View file

@ -333,7 +333,8 @@ async fn run<C: Coin, D: Db, Co: Coordinator>(raw_db: D, coin: C, mut coordinato
match msg.msg.clone() { match msg.msg.clone() {
CoordinatorMessage::KeyGen(msg) => { CoordinatorMessage::KeyGen(msg) => {
match key_gen.handle(msg).await { match key_gen.handle(msg).await {
KeyGenEvent::KeyConfirmed { activation_number, substrate_keys, coin_keys } => { // TODO: Handle substrate_keys
KeyGenEvent::KeyConfirmed { activation_number, substrate_keys: _, coin_keys } => {
let keys = coin_keys; let keys = coin_keys;
let key = keys.group_key(); let key = keys.group_key();
scanner.rotate_key(activation_number, key).await; scanner.rotate_key(activation_number, key).await;