From f469d03d6f4b4baf1519ec9906c38b051d25f01b Mon Sep 17 00:00:00 2001 From: Angelos Stylianidis Date: Thu, 20 Feb 2025 18:39:30 +0200 Subject: [PATCH] use only our tofn --- Cargo.lock | 27 +++------------------- Cargo.toml | 2 +- contracts/multisig-prover/Cargo.toml | 2 +- packages/aleo-utils/src/block_processor.rs | 24 ------------------- 4 files changed, 5 insertions(+), 50 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fe5546d67..4290a9c11 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2011,7 +2011,7 @@ dependencies = [ "semver 1.0.25", "service-registry-api", "thiserror 1.0.69", - "tofn 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tofn", ] [[package]] @@ -4674,7 +4674,7 @@ dependencies = [ "service-registry", "service-registry-api", "sha3", - "tofn 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tofn", "voting-verifier", ] @@ -5893,7 +5893,7 @@ dependencies = [ "stellar-xdr", "sui-gateway", "thiserror 1.0.69", - "tofn 1.1.0 (git+https://github.com/eigerco/tofn.git?branch=aleo-schnorr)", + "tofn", "voting-verifier", ] @@ -11223,27 +11223,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -[[package]] -name = "tofn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "255a99b697179124254f23d05c2bc394276ba870791d99a9f5896f7f60d40eb9" -dependencies = [ - "bincode", - "crypto-bigint", - "ecdsa", - "ed25519 2.2.3", - "ed25519-dalek", - "hmac", - "k256", - "rand 0.8.5", - "rand_chacha 0.3.1", - "serde", - "sha2 0.10.8", - "tracing", - "zeroize", -] - [[package]] name = "tofn" version = "1.1.0" diff --git a/Cargo.toml b/Cargo.toml index 3f577f55d..035fa8b9c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -95,7 +95,7 @@ starknet-core = "0.12.0" starknet-providers = "0.12.0" syn = "2.0.92" thiserror = "1.0.61" -tofn = { version = "1.1" } +tofn = { version = "1.1", git = "https://github.com/eigerco/tofn.git", branch = "aleo-schnorr" } tokio = "1.38.0" tokio-stream = "0.1.11" tokio-util = "0.7.11" diff --git a/contracts/multisig-prover/Cargo.toml b/contracts/multisig-prover/Cargo.toml index 69ef3724e..57061d56c 100644 --- a/contracts/multisig-prover/Cargo.toml +++ b/contracts/multisig-prover/Cargo.toml @@ -75,7 +75,7 @@ elliptic-curve = "0.13.5" generic-array = "0.14.7" goldie = { workspace = true } prost = "0.12.4" -tofn = { version = "1.1", git = "https://github.com/eigerco/tofn.git", branch = "aleo-schnorr", features = [ "aleo-schnorr"] } +tofn = { workspace = true, features = ["aleo-schnorr"] } snarkvm = "1.2.1" [lints] diff --git a/packages/aleo-utils/src/block_processor.rs b/packages/aleo-utils/src/block_processor.rs index 9fe1a4407..831e50e8a 100644 --- a/packages/aleo-utils/src/block_processor.rs +++ b/packages/aleo-utils/src/block_processor.rs @@ -51,27 +51,3 @@ pub struct GatewayOutput { pub destination_chain: [u8; 32], } -#[cfg(test)] -mod tests { - use crate::block_processor::{Block, Transaction}; - - #[test] - fn parse_block() { - let block = include_str!( - "../../../test/data/aleo-utils/ab1yf27fcu4exccn4jt6wmwuxkseafyxhs5vk92su4nutq35s4jdupqeeprdp.json" - ); - - let block = serde_json::from_str::(block); - assert!(block.is_ok()); - } - - #[test] - fn parse_transaction() { - let transaction = include_str!( - "../../../test/data/aleo-utils/at1dgmvx30f79wt6w8fcjurwtsc5zak4efg4ayyme79862xylve7gxsq3nfh6.json" - ); - - let transaction = serde_json::from_str::(transaction); - assert!(transaction.is_ok()); - } -}