From 4e6d0d1d196b6477413249c01e32a75fc2bb9138 Mon Sep 17 00:00:00 2001 From: raychu86 <14917648+raychu86@users.noreply.github.com> Date: Fri, 15 Mar 2024 22:50:28 -0700 Subject: [PATCH 1/8] Fix test configs --- node/bft/src/worker.rs | 2 +- node/bft/tests/common/primary.rs | 2 +- node/bft/tests/components/mod.rs | 2 +- node/bft/tests/components/pending.rs | 2 +- node/bft/tests/components/worker.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/node/bft/src/worker.rs b/node/bft/src/worker.rs index ffb3fceee3..c699168c62 100644 --- a/node/bft/src/worker.rs +++ b/node/bft/src/worker.rs @@ -556,7 +556,7 @@ mod tests { async fn test_max_redundant_requests() { let rng = &mut TestRng::default(); // Sample a committee. - let committee = snarkvm::ledger::committee::test_helpers::sample_committee_for_round_and_size(0, 100, rng); + let committee = snarkvm::ledger::committee::test_helpers::sample_committee_for_round_and_size(0, 10, rng); let committee_clone = committee.clone(); // Setup the mock ledger. let mut mock_ledger = MockLedger::default(); diff --git a/node/bft/tests/common/primary.rs b/node/bft/tests/common/primary.rs index d1aa748852..18ace2646f 100644 --- a/node/bft/tests/common/primary.rs +++ b/node/bft/tests/common/primary.rs @@ -138,7 +138,7 @@ impl TestNetwork { .collect(); let gen_key = *accounts[0].private_key(); let public_balance_per_validator = - (1_500_000_000_000_000 - (config.num_nodes as u64) * 1_000_000_000_000) / (config.num_nodes as u64); + (1_500_000_000_000_000 - (config.num_nodes as u64) * 10_000_000_000_000) / (config.num_nodes as u64); let mut balances = IndexMap::, u64>::new(); for account in accounts.iter() { balances.insert(account.address(), public_balance_per_validator); diff --git a/node/bft/tests/components/mod.rs b/node/bft/tests/components/mod.rs index a153ad7b43..a1eb8a1552 100644 --- a/node/bft/tests/components/mod.rs +++ b/node/bft/tests/components/mod.rs @@ -42,7 +42,7 @@ pub fn sample_ledger( committee.members().iter().map(|(address, (amount, _))| (*address, (*address, *address, *amount))).collect(); let gen_key = *accounts[0].private_key(); let public_balance_per_validator = - (1_500_000_000_000_000 - (num_nodes as u64) * 1_000_000_000_000) / (num_nodes as u64); + (1_500_000_000_000_000 - (num_nodes as u64) * 10_000_000_000_000) / (num_nodes as u64); let mut balances = IndexMap::, u64>::new(); for account in accounts.iter() { balances.insert(account.address(), public_balance_per_validator); diff --git a/node/bft/tests/components/pending.rs b/node/bft/tests/components/pending.rs index b1405207d4..b4c1d65223 100644 --- a/node/bft/tests/components/pending.rs +++ b/node/bft/tests/components/pending.rs @@ -18,7 +18,7 @@ use snarkvm::prelude::TestRng; #[test] fn test_max_redundant_requests() { - const NUM_NODES: u16 = 100; + const NUM_NODES: u16 = 10; // Initialize the RNG. let rng = &mut TestRng::default(); diff --git a/node/bft/tests/components/worker.rs b/node/bft/tests/components/worker.rs index 279bc1bf92..a2273b35e2 100644 --- a/node/bft/tests/components/worker.rs +++ b/node/bft/tests/components/worker.rs @@ -27,7 +27,7 @@ use std::net::SocketAddr; #[tokio::test] #[rustfmt::skip] async fn test_resend_transmission_request() { - const NUM_NODES: u16 = 100; + const NUM_NODES: u16 = 10; // Initialize the RNG. let rng = &mut TestRng::default(); From 16c59b9b015aaae62730ba0f447749127822b78d Mon Sep 17 00:00:00 2001 From: raychu86 <14917648+raychu86@users.noreply.github.com> Date: Fri, 15 Mar 2024 23:16:30 -0700 Subject: [PATCH 2/8] Update expected test value --- node/bft/src/worker.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/bft/src/worker.rs b/node/bft/src/worker.rs index c699168c62..dfa6490fe5 100644 --- a/node/bft/src/worker.rs +++ b/node/bft/src/worker.rs @@ -567,7 +567,7 @@ mod tests { let ledger: Arc> = Arc::new(mock_ledger); // Ensure the maximum number of redundant requests is correct and consistent across iterations. - assert_eq!(max_redundant_requests(ledger, 0), 34, "Update me if the formula changes"); + assert_eq!(max_redundant_requests(ledger, 0), 4, "Update me if the formula changes"); } #[tokio::test] From af15155c6dc6c9f5203742c1eff07de3b1330a32 Mon Sep 17 00:00:00 2001 From: raychu86 <14917648+raychu86@users.noreply.github.com> Date: Mon, 18 Mar 2024 09:26:45 -0700 Subject: [PATCH 3/8] Update expected values --- node/bft/tests/components/worker.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/node/bft/tests/components/worker.rs b/node/bft/tests/components/worker.rs index a2273b35e2..d1658bb02f 100644 --- a/node/bft/tests/components/worker.rs +++ b/node/bft/tests/components/worker.rs @@ -36,6 +36,10 @@ async fn test_resend_transmission_request() { // Sample a worker. let worker = sample_worker(0, ledger.clone()); + // Determine the maximum number of redundant requests. + let max_redundancy = max_redundant_requests(ledger.clone(), 0); + assert_eq!(max_redundancy, 4, "Update me if the formula changes"); + // Prepare a dummy transmission ID. let peer_ip = SocketAddr::from(([127, 0, 0, 1], 1234)); let transmission_id = TransmissionID::Transaction(::TransactionID::default()); @@ -75,14 +79,14 @@ async fn test_resend_transmission_request() { // Ensure the number of callbacks is correct. assert_eq!(pending.num_callbacks(transmission_id), 1 + i, "Incorrect number of callbacks for transmission"); // Ensure the number of sent requests is correct. - assert_eq!(pending.num_sent_requests(transmission_id), 1 + i, "Incorrect number of sent requests for transmission"); + assert_eq!(pending.num_sent_requests(transmission_id), (1 + i).min(max_redundancy), "Incorrect number of sent requests for transmission"); } } #[tokio::test] #[rustfmt::skip] async fn test_flood_transmission_requests() { - const NUM_NODES: u16 = 100; + const NUM_NODES: u16 = 10; // Initialize the RNG. let rng = &mut TestRng::default(); @@ -93,7 +97,7 @@ async fn test_flood_transmission_requests() { // Determine the maximum number of redundant requests. let max_redundancy = max_redundant_requests(ledger.clone(), 0); - assert_eq!(max_redundancy, 34, "Update me if the formula changes"); + assert_eq!(max_redundancy, 4, "Update me if the formula changes"); // Prepare a dummy transmission ID. let peer_ip = SocketAddr::from(([127, 0, 0, 1], 1234)); From f4edfc7e1a7434abf6b566d142b40666c4a4c305 Mon Sep 17 00:00:00 2001 From: raychu86 <14917648+raychu86@users.noreply.github.com> Date: Mon, 18 Mar 2024 10:06:42 -0700 Subject: [PATCH 4/8] Update expected max_redundant_requests value --- node/bft/tests/components/pending.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/bft/tests/components/pending.rs b/node/bft/tests/components/pending.rs index b4c1d65223..4f00fb3436 100644 --- a/node/bft/tests/components/pending.rs +++ b/node/bft/tests/components/pending.rs @@ -25,5 +25,5 @@ fn test_max_redundant_requests() { // Sample a ledger. let ledger = sample_ledger(NUM_NODES, rng); // Ensure the maximum number of redundant requests is correct and consistent across iterations. - assert_eq!(max_redundant_requests(ledger, 0), 34, "Update me if the formula changes"); + assert_eq!(max_redundant_requests(ledger, 0), 4, "Update me if the formula changes"); } From aff8f2b6930158d90d4158d124da58a32fcf48a9 Mon Sep 17 00:00:00 2001 From: raychu86 <14917648+raychu86@users.noreply.github.com> Date: Tue, 19 Mar 2024 11:32:27 -0700 Subject: [PATCH 5/8] Update snarkVM rev - e29c1df --- Cargo.lock | 116 +++++++++++++-------------- Cargo.toml | 2 +- node/bft/tests/components/pending.rs | 8 +- node/bft/tests/components/worker.rs | 10 +-- 4 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2b724e9d99..e76be79509 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3301,7 +3301,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "anstyle", "anyhow", @@ -3332,7 +3332,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "aleo-std", "anyhow", @@ -3362,7 +3362,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3376,7 +3376,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -3387,7 +3387,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -3397,7 +3397,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -3407,7 +3407,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "indexmap 2.2.5", "itertools 0.11.0", @@ -3425,12 +3425,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" [[package]] name = "snarkvm-circuit-network" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -3441,7 +3441,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "paste", "snarkvm-circuit-account", @@ -3456,7 +3456,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -3471,7 +3471,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3484,7 +3484,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -3493,7 +3493,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3503,7 +3503,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3515,7 +3515,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3527,7 +3527,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3538,7 +3538,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3550,7 +3550,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -3563,7 +3563,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "bs58", "snarkvm-console-network", @@ -3574,7 +3574,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "blake2s_simd", "smallvec", @@ -3587,7 +3587,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "aleo-std", "rayon", @@ -3598,7 +3598,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "anyhow", "indexmap 2.2.5", @@ -3621,7 +3621,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "anyhow", "bech32", @@ -3639,7 +3639,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "enum_index", "enum_index_derive", @@ -3660,7 +3660,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -3675,7 +3675,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3686,7 +3686,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-console-network-environment", ] @@ -3694,7 +3694,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3704,7 +3704,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3715,7 +3715,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3726,7 +3726,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3737,7 +3737,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3748,7 +3748,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "rand", "rayon", @@ -3762,7 +3762,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "aleo-std", "anyhow", @@ -3779,7 +3779,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "aleo-std", "anyhow", @@ -3804,7 +3804,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "anyhow", "rand", @@ -3816,7 +3816,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "indexmap 2.2.5", "rayon", @@ -3835,7 +3835,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-coinbase" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "aleo-std", "anyhow", @@ -3855,7 +3855,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "anyhow", "indexmap 2.2.5", @@ -3873,7 +3873,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -3886,7 +3886,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "indexmap 2.2.5", "rayon", @@ -3899,7 +3899,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "indexmap 2.2.5", "serde_json", @@ -3911,7 +3911,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "bytes", "serde_json", @@ -3922,7 +3922,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "indexmap 2.2.5", "rayon", @@ -3937,7 +3937,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "bytes", "serde_json", @@ -3950,7 +3950,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "snarkvm-console", "snarkvm-ledger-coinbase", @@ -3959,7 +3959,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "async-trait", "reqwest", @@ -3972,7 +3972,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "aleo-std-storage", "anyhow", @@ -3998,7 +3998,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "once_cell", "snarkvm-circuit", @@ -4013,7 +4013,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4022,7 +4022,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "aleo-std", "anyhow", @@ -4047,7 +4047,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "aleo-std", "anyhow", @@ -4073,7 +4073,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "aleo-std", "colored", @@ -4096,7 +4096,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "indexmap 2.2.5", "paste", @@ -4110,7 +4110,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "bincode", "once_cell", @@ -4123,7 +4123,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "aleo-std", "anyhow", @@ -4144,7 +4144,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" dependencies = [ "proc-macro2", "quote 1.0.35", diff --git a/Cargo.toml b/Cargo.toml index f1107f7c36..625bd434c5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ default-features = false [workspace.dependencies.snarkvm] git = "https://github.com/AleoHQ/snarkVM.git" -rev = "01c8b09" +rev = "e29c1df" #version = "=0.16.18" features = [ "circuit", "console", "rocks" ] diff --git a/node/bft/tests/components/pending.rs b/node/bft/tests/components/pending.rs index 4f00fb3436..f4766084a5 100644 --- a/node/bft/tests/components/pending.rs +++ b/node/bft/tests/components/pending.rs @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -use crate::components::sample_ledger; +use crate::{common::CurrentNetwork, components::sample_ledger}; use snarkos_node_bft::helpers::max_redundant_requests; -use snarkvm::prelude::TestRng; +use snarkvm::{ledger::committee::Committee, prelude::TestRng}; #[test] fn test_max_redundant_requests() { - const NUM_NODES: u16 = 10; + const NUM_NODES: u16 = Committee::::MAX_COMMITTEE_SIZE; // Initialize the RNG. let rng = &mut TestRng::default(); // Sample a ledger. let ledger = sample_ledger(NUM_NODES, rng); // Ensure the maximum number of redundant requests is correct and consistent across iterations. - assert_eq!(max_redundant_requests(ledger, 0), 4, "Update me if the formula changes"); + assert_eq!(max_redundant_requests(ledger, 0), 34, "Update me if the formula changes"); } diff --git a/node/bft/tests/components/worker.rs b/node/bft/tests/components/worker.rs index d1658bb02f..1877bd859a 100644 --- a/node/bft/tests/components/worker.rs +++ b/node/bft/tests/components/worker.rs @@ -18,7 +18,7 @@ use crate::{ }; use snarkos_node_bft::helpers::max_redundant_requests; use snarkvm::{ - ledger::narwhal::TransmissionID, + ledger::{committee::Committee, narwhal::TransmissionID}, prelude::{Network, TestRng}, }; @@ -27,7 +27,7 @@ use std::net::SocketAddr; #[tokio::test] #[rustfmt::skip] async fn test_resend_transmission_request() { - const NUM_NODES: u16 = 10; + const NUM_NODES: u16 = Committee::::MAX_COMMITTEE_SIZE; // Initialize the RNG. let rng = &mut TestRng::default(); @@ -38,7 +38,7 @@ async fn test_resend_transmission_request() { // Determine the maximum number of redundant requests. let max_redundancy = max_redundant_requests(ledger.clone(), 0); - assert_eq!(max_redundancy, 4, "Update me if the formula changes"); + assert_eq!(max_redundancy, 34, "Update me if the formula changes"); // Prepare a dummy transmission ID. let peer_ip = SocketAddr::from(([127, 0, 0, 1], 1234)); @@ -86,7 +86,7 @@ async fn test_resend_transmission_request() { #[tokio::test] #[rustfmt::skip] async fn test_flood_transmission_requests() { - const NUM_NODES: u16 = 10; + const NUM_NODES: u16 = Committee::::MAX_COMMITTEE_SIZE; // Initialize the RNG. let rng = &mut TestRng::default(); @@ -97,7 +97,7 @@ async fn test_flood_transmission_requests() { // Determine the maximum number of redundant requests. let max_redundancy = max_redundant_requests(ledger.clone(), 0); - assert_eq!(max_redundancy, 4, "Update me if the formula changes"); + assert_eq!(max_redundancy, 34, "Update me if the formula changes"); // Prepare a dummy transmission ID. let peer_ip = SocketAddr::from(([127, 0, 0, 1], 1234)); From 086103ec05772ed22d4c5a8d1fe8560cf41c8486 Mon Sep 17 00:00:00 2001 From: raychu86 <14917648+raychu86@users.noreply.github.com> Date: Tue, 19 Mar 2024 15:56:52 -0700 Subject: [PATCH 6/8] Update snarkVM rev - eefd27d --- Cargo.lock | 116 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 2 +- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e76be79509..140828d972 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3301,7 +3301,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "anstyle", "anyhow", @@ -3332,7 +3332,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "aleo-std", "anyhow", @@ -3362,7 +3362,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -3376,7 +3376,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-network", @@ -3387,7 +3387,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -3397,7 +3397,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -3407,7 +3407,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "indexmap 2.2.5", "itertools 0.11.0", @@ -3425,12 +3425,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" [[package]] name = "snarkvm-circuit-network" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -3441,7 +3441,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "paste", "snarkvm-circuit-account", @@ -3456,7 +3456,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -3471,7 +3471,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3484,7 +3484,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -3493,7 +3493,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3503,7 +3503,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3515,7 +3515,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3527,7 +3527,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3538,7 +3538,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -3550,7 +3550,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -3563,7 +3563,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "bs58", "snarkvm-console-network", @@ -3574,7 +3574,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "blake2s_simd", "smallvec", @@ -3587,7 +3587,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "aleo-std", "rayon", @@ -3598,7 +3598,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "anyhow", "indexmap 2.2.5", @@ -3621,7 +3621,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "anyhow", "bech32", @@ -3639,7 +3639,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "enum_index", "enum_index_derive", @@ -3660,7 +3660,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -3675,7 +3675,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3686,7 +3686,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-console-network-environment", ] @@ -3694,7 +3694,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3704,7 +3704,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3715,7 +3715,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3726,7 +3726,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3737,7 +3737,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -3748,7 +3748,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "rand", "rayon", @@ -3762,7 +3762,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "aleo-std", "anyhow", @@ -3779,7 +3779,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "aleo-std", "anyhow", @@ -3804,7 +3804,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "anyhow", "rand", @@ -3816,7 +3816,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "indexmap 2.2.5", "rayon", @@ -3835,7 +3835,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-coinbase" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "aleo-std", "anyhow", @@ -3855,7 +3855,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "anyhow", "indexmap 2.2.5", @@ -3873,7 +3873,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -3886,7 +3886,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "indexmap 2.2.5", "rayon", @@ -3899,7 +3899,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "indexmap 2.2.5", "serde_json", @@ -3911,7 +3911,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "bytes", "serde_json", @@ -3922,7 +3922,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "indexmap 2.2.5", "rayon", @@ -3937,7 +3937,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "bytes", "serde_json", @@ -3950,7 +3950,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "snarkvm-console", "snarkvm-ledger-coinbase", @@ -3959,7 +3959,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "async-trait", "reqwest", @@ -3972,7 +3972,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "aleo-std-storage", "anyhow", @@ -3998,7 +3998,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "once_cell", "snarkvm-circuit", @@ -4013,7 +4013,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "metrics", "metrics-exporter-prometheus", @@ -4022,7 +4022,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "aleo-std", "anyhow", @@ -4047,7 +4047,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "aleo-std", "anyhow", @@ -4073,7 +4073,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "aleo-std", "colored", @@ -4096,7 +4096,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "indexmap 2.2.5", "paste", @@ -4110,7 +4110,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "bincode", "once_cell", @@ -4123,7 +4123,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "aleo-std", "anyhow", @@ -4144,7 +4144,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "0.16.19" -source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf" +source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb" dependencies = [ "proc-macro2", "quote 1.0.35", diff --git a/Cargo.toml b/Cargo.toml index 625bd434c5..e97eed2eae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ default-features = false [workspace.dependencies.snarkvm] git = "https://github.com/AleoHQ/snarkVM.git" -rev = "e29c1df" +rev = "eefd27d" #version = "=0.16.18" features = [ "circuit", "console", "rocks" ] From efc6468b8add8c14e891a01961aeadbcaec5bba7 Mon Sep 17 00:00:00 2001 From: raychu86 <14917648+raychu86@users.noreply.github.com> Date: Tue, 19 Mar 2024 16:00:09 -0700 Subject: [PATCH 7/8] Use variables instead of constants --- node/bft/src/worker.rs | 7 +++++-- node/bft/tests/common/primary.rs | 6 ++++-- node/bft/tests/components/mod.rs | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/node/bft/src/worker.rs b/node/bft/src/worker.rs index dfa6490fe5..25e0a9bd3b 100644 --- a/node/bft/src/worker.rs +++ b/node/bft/src/worker.rs @@ -554,9 +554,12 @@ mod tests { #[tokio::test] async fn test_max_redundant_requests() { + const NUM_NODES: u16 = Committee::::MAX_COMMITTEE_SIZE; + let rng = &mut TestRng::default(); // Sample a committee. - let committee = snarkvm::ledger::committee::test_helpers::sample_committee_for_round_and_size(0, 10, rng); + let committee = + snarkvm::ledger::committee::test_helpers::sample_committee_for_round_and_size(0, NUM_NODES, rng); let committee_clone = committee.clone(); // Setup the mock ledger. let mut mock_ledger = MockLedger::default(); @@ -567,7 +570,7 @@ mod tests { let ledger: Arc> = Arc::new(mock_ledger); // Ensure the maximum number of redundant requests is correct and consistent across iterations. - assert_eq!(max_redundant_requests(ledger, 0), 4, "Update me if the formula changes"); + assert_eq!(max_redundant_requests(ledger, 0), 34, "Update me if the formula changes"); } #[tokio::test] diff --git a/node/bft/tests/common/primary.rs b/node/bft/tests/common/primary.rs index 18ace2646f..086112247d 100644 --- a/node/bft/tests/common/primary.rs +++ b/node/bft/tests/common/primary.rs @@ -29,6 +29,7 @@ use snarkvm::{ console::{ account::{Address, PrivateKey}, algorithms::{Hash, BHP256}, + network::Network, }, ledger::{ block::Block, @@ -137,8 +138,9 @@ impl TestNetwork { .map(|(address, (amount, _))| (*address, (*address, *address, *amount))) .collect(); let gen_key = *accounts[0].private_key(); - let public_balance_per_validator = - (1_500_000_000_000_000 - (config.num_nodes as u64) * 10_000_000_000_000) / (config.num_nodes as u64); + let public_balance_per_validator = (::STARTING_SUPPLY + - (config.num_nodes as u64) * MIN_VALIDATOR_STAKE) + / (config.num_nodes as u64); let mut balances = IndexMap::, u64>::new(); for account in accounts.iter() { balances.insert(account.address(), public_balance_per_validator); diff --git a/node/bft/tests/components/mod.rs b/node/bft/tests/components/mod.rs index a1eb8a1552..1c9c573f9e 100644 --- a/node/bft/tests/components/mod.rs +++ b/node/bft/tests/components/mod.rs @@ -22,7 +22,7 @@ use snarkos_node_bft_ledger_service::LedgerService; use snarkos_node_bft_storage_service::BFTMemoryService; use snarkvm::{ console::{account::Address, network::Network}, - ledger::{narwhal::BatchHeader, store::helpers::memory::ConsensusMemory}, + ledger::{committee::MIN_VALIDATOR_STAKE, narwhal::BatchHeader, store::helpers::memory::ConsensusMemory}, prelude::TestRng, }; @@ -42,7 +42,7 @@ pub fn sample_ledger( committee.members().iter().map(|(address, (amount, _))| (*address, (*address, *address, *amount))).collect(); let gen_key = *accounts[0].private_key(); let public_balance_per_validator = - (1_500_000_000_000_000 - (num_nodes as u64) * 10_000_000_000_000) / (num_nodes as u64); + (::STARTING_SUPPLY - (num_nodes as u64) * MIN_VALIDATOR_STAKE) / (num_nodes as u64); let mut balances = IndexMap::, u64>::new(); for account in accounts.iter() { balances.insert(account.address(), public_balance_per_validator); From 777c00d51d70bac6d306c243becf23cb0d7a845a Mon Sep 17 00:00:00 2001 From: raychu86 <14917648+raychu86@users.noreply.github.com> Date: Wed, 20 Mar 2024 18:12:44 -0700 Subject: [PATCH 8/8] nit --- node/bft/tests/common/primary.rs | 2 +- node/bft/tests/components/mod.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/node/bft/tests/common/primary.rs b/node/bft/tests/common/primary.rs index 086112247d..029c8d54b0 100644 --- a/node/bft/tests/common/primary.rs +++ b/node/bft/tests/common/primary.rs @@ -138,7 +138,7 @@ impl TestNetwork { .map(|(address, (amount, _))| (*address, (*address, *address, *amount))) .collect(); let gen_key = *accounts[0].private_key(); - let public_balance_per_validator = (::STARTING_SUPPLY + let public_balance_per_validator = (CurrentNetwork::STARTING_SUPPLY - (config.num_nodes as u64) * MIN_VALIDATOR_STAKE) / (config.num_nodes as u64); let mut balances = IndexMap::, u64>::new(); diff --git a/node/bft/tests/components/mod.rs b/node/bft/tests/components/mod.rs index 1c9c573f9e..65336665cc 100644 --- a/node/bft/tests/components/mod.rs +++ b/node/bft/tests/components/mod.rs @@ -42,7 +42,7 @@ pub fn sample_ledger( committee.members().iter().map(|(address, (amount, _))| (*address, (*address, *address, *amount))).collect(); let gen_key = *accounts[0].private_key(); let public_balance_per_validator = - (::STARTING_SUPPLY - (num_nodes as u64) * MIN_VALIDATOR_STAKE) / (num_nodes as u64); + (CurrentNetwork::STARTING_SUPPLY - (num_nodes as u64) * MIN_VALIDATOR_STAKE) / (num_nodes as u64); let mut balances = IndexMap::, u64>::new(); for account in accounts.iter() { balances.insert(account.address(), public_balance_per_validator);