From 5765d1d278e9a095ee1e88ceb731790fcb3c7eb3 Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Mon, 1 May 2023 04:58:50 -0400 Subject: [PATCH] Update to May's nightly Doesn't use the PR due to the needed changes. --- .github/nightly-version | 2 +- .github/workflows/tests.yml | 2 +- Cargo.lock | 44 ------------------------------------ coins/ethereum/Cargo.toml | 2 +- crypto/dkg/Cargo.toml | 2 +- crypto/frost/Cargo.toml | 2 +- crypto/transcript/src/lib.rs | 2 +- processor/src/scheduler.rs | 2 +- 8 files changed, 7 insertions(+), 51 deletions(-) diff --git a/.github/nightly-version b/.github/nightly-version index 323c56b0..35020457 100644 --- a/.github/nightly-version +++ b/.github/nightly-version @@ -1 +1 @@ -nightly-2023-04-01 +nightly-2023-05-01 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 23a947be..cdc1e11c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,7 +25,7 @@ jobs: rust-components: clippy - name: Run Clippy - run: cargo clippy --all-features --all-targets -- -D warnings + run: cargo clippy --all-features --all-targets -- -D warnings -A clippy::items_after_test_module deny: runs-on: ubuntu-latest diff --git a/Cargo.lock b/Cargo.lock index 2dfe7fe6..d2791aaf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2599,7 +2599,6 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tokio-tungstenite", "tracing", "tracing-futures", "url", @@ -10580,22 +10579,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "tokio-tungstenite" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" -dependencies = [ - "futures-util", - "log", - "rustls 0.20.8", - "tokio", - "tokio-rustls", - "tungstenite", - "webpki 0.22.0", - "webpki-roots", -] - [[package]] name = "tokio-util" version = "0.7.8" @@ -10886,27 +10869,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" -[[package]] -name = "tungstenite" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" -dependencies = [ - "base64 0.13.1", - "byteorder", - "bytes", - "http", - "httparse", - "log", - "rand 0.8.5", - "rustls 0.20.8", - "sha1", - "thiserror", - "url", - "utf-8", - "webpki 0.22.0", -] - [[package]] name = "turn" version = "0.6.1" @@ -11050,12 +11012,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - [[package]] name = "utf8parse" version = "0.2.1" diff --git a/coins/ethereum/Cargo.toml b/coins/ethereum/Cargo.toml index 074f4b26..02f15772 100644 --- a/coins/ethereum/Cargo.toml +++ b/coins/ethereum/Cargo.toml @@ -28,7 +28,7 @@ frost = { package = "modular-frost", path = "../../crypto/frost", features = ["s eyre = "0.6" -ethers = { version = "2", features = ["abigen", "ethers-solc"] } +ethers = { version = "2", default-features = false, features = ["abigen", "ethers-solc"] } [build-dependencies] ethers-solc = "2" diff --git a/crypto/dkg/Cargo.toml b/crypto/dkg/Cargo.toml index dd8c673e..a154bfd0 100644 --- a/crypto/dkg/Cargo.toml +++ b/crypto/dkg/Cargo.toml @@ -35,4 +35,4 @@ ciphersuite = { path = "../ciphersuite", version = "0.3", features = ["ristretto [features] serde = ["dep:serde"] -tests = [] +tests = ["rand_core/getrandom"] diff --git a/crypto/frost/Cargo.toml b/crypto/frost/Cargo.toml index df34d82c..89233750 100644 --- a/crypto/frost/Cargo.toml +++ b/crypto/frost/Cargo.toml @@ -53,4 +53,4 @@ p256 = ["ciphersuite/p256"] ed448 = ["minimal-ed448", "ciphersuite/ed448"] -tests = ["hex", "dkg/tests"] +tests = ["hex", "rand_core/getrandom", "dkg/tests"] diff --git a/crypto/transcript/src/lib.rs b/crypto/transcript/src/lib.rs index 74ddf928..e9e99005 100644 --- a/crypto/transcript/src/lib.rs +++ b/crypto/transcript/src/lib.rs @@ -1,7 +1,7 @@ #![cfg_attr(docsrs, feature(doc_auto_cfg))] +#![doc = include_str!("../README.md")] #![no_std] -///! A transcript trait valid over a variety of transcript formats. use zeroize::Zeroize; use digest::{ diff --git a/processor/src/scheduler.rs b/processor/src/scheduler.rs index c308ab43..eacd10b8 100644 --- a/processor/src/scheduler.rs +++ b/processor/src/scheduler.rs @@ -264,7 +264,7 @@ impl Scheduler { // The above division isn't perfect let mut remainder = diff - (per_payment * payments_len); - for mut payment in payments.iter_mut() { + for payment in payments.iter_mut() { payment.amount = payment.amount.saturating_sub(per_payment + remainder); // Only subtract the remainder once remainder = 0;