From 1ce5cae3a4a2962cfd34712806b145f65c0030e9 Mon Sep 17 00:00:00 2001 From: Howard Wu <9260812+howardwu@users.noreply.github.com> Date: Sat, 25 Nov 2023 15:58:21 -0800 Subject: [PATCH 1/6] Fix the minimum committee size --- ledger/committee/src/lib.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ledger/committee/src/lib.rs b/ledger/committee/src/lib.rs index 5d81de4414..217ee8249d 100644 --- a/ledger/committee/src/lib.rs +++ b/ledger/committee/src/lib.rs @@ -49,16 +49,14 @@ impl Committee { /// Initializes a new `Committee` instance. pub fn new_genesis(members: IndexMap, (u64, bool)>) -> Result { - // Ensure there are exactly 4 members. - ensure!(members.len() == 4, "Genesis committee must have 4 members"); // Return the new committee. Self::new(0u64, members) } /// Initializes a new `Committee` instance. pub fn new(starting_round: u64, members: IndexMap, (u64, bool)>) -> Result { - // Ensure there are at least 4 members. - ensure!(members.len() >= 4, "Committee must have at least 4 members"); + // Ensure there are at least 3 members. + ensure!(members.len() >= 3, "Committee must have at least 3 members"); // Ensure there are no more than the maximum number of members. ensure!( members.len() <= Self::MAX_COMMITTEE_SIZE as usize, From 4690056e8a6106d7fa67249098cd05d3560caecb Mon Sep 17 00:00:00 2001 From: Howard Wu <9260812+howardwu@users.noreply.github.com> Date: Sat, 25 Nov 2023 16:26:50 -0800 Subject: [PATCH 2/6] Fix test --- ledger/committee/src/lib.rs | 2 +- ledger/committee/src/prop_tests.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ledger/committee/src/lib.rs b/ledger/committee/src/lib.rs index 217ee8249d..7d5072835a 100644 --- a/ledger/committee/src/lib.rs +++ b/ledger/committee/src/lib.rs @@ -374,7 +374,7 @@ mod tests { // Set the number of rounds. const NUM_ROUNDS: u64 = 256 * 2_000; // Sample the number of members. - let num_members = rng.gen_range(4..50); + let num_members = rng.gen_range(3..50); // Sample a committee. let committee = crate::test_helpers::sample_committee_custom(num_members, rng); // Check the leader distribution. diff --git a/ledger/committee/src/prop_tests.rs b/ledger/committee/src/prop_tests.rs index c66769fa98..f0aa2e7bb2 100644 --- a/ledger/committee/src/prop_tests.rs +++ b/ledger/committee/src/prop_tests.rs @@ -125,7 +125,7 @@ impl Arbitrary for ValidatorSet { fn arbitrary_with(_: Self::Parameters) -> Self::Strategy { // use minimal validator set to speed up tests that require signing from the committee members - validator_set(any_valid_validator(), size_range(4..=4usize)).boxed() + validator_set(any_valid_validator(), size_range(3..=4usize)).boxed() } } @@ -149,7 +149,7 @@ pub fn any_valid_private_key() -> BoxedStrategy> { #[allow(dead_code)] fn too_small_committee() -> BoxedStrategy>> { - (1u64.., validator_set(any_valid_validator(), 0..4)).prop_map(to_committee).boxed() + (1u64.., validator_set(any_valid_validator(), 0..3)).prop_map(to_committee).boxed() } #[allow(dead_code)] @@ -199,5 +199,5 @@ fn invalid_stakes(#[strategy(too_low_stake_committee())] committee: Result>) { - assert!(matches!(committee, Err(e) if e.to_string().as_str() == "Committee must have at least 4 members")) + assert!(matches!(committee, Err(e) if e.to_string().as_str() == "Committee must have at least 3 members")) } From 585fb104f32fe22cff2365709a52e00ffba4016b Mon Sep 17 00:00:00 2001 From: Alessandro Coglio Date: Mon, 27 Nov 2023 23:46:48 -0800 Subject: [PATCH 3/6] Update my web page URL. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dbd1bf0af6..e2665cb94e 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ Thank you for helping make SnarkVM better! Collin Chin
Collin Chin
πŸ’» πŸ“– πŸ‘€ - Alessandro Coglio
Alessandro Coglio
πŸ’» πŸ“– ⚠️ + Alessandro Coglio
Alessandro Coglio
πŸ’» πŸ“– ⚠️ Niklas Long
Niklas Long
πŸ’» jules
jules
πŸ’» Ali Mousa
Ali Mousa
πŸ’» From 764b8973d7f55ffdfcf05649311a04e106ad9f14 Mon Sep 17 00:00:00 2001 From: collin <16715212+collinc97@users.noreply.github.com> Date: Wed, 29 Nov 2023 10:05:20 -0800 Subject: [PATCH 4/6] regen contributors --- README.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dbd1bf0af6..54a136fe4a 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ - +

## Table of Contents @@ -109,16 +109,16 @@ Thank you for helping make SnarkVM better! jules
jules
πŸ’» Ali Mousa
Ali Mousa
πŸ’» Weikeng Chen
Weikeng Chen
πŸ’» - Max Bruce
Max Bruce
πŸ’» + Evan Schott
Evan Schott
πŸ’» + Max Bruce
Max Bruce
πŸ’» zhiqiangxu
zhiqiangxu
πŸ’» Javier RodrΓ­guez Chatruc
Javier RodrΓ­guez Chatruc
πŸ’» Eduardo Morais
Eduardo Morais
πŸ’» Maciej ZwoliΕ„ski
Maciej ZwoliΕ„ski
πŸ’» Ivan Litteri
Ivan Litteri
πŸ’» Francisco Strambini
Francisco Strambini
πŸ’» - swift-mx
swift-mx
πŸ’» Haruka
Haruka
πŸ› πŸ’» @@ -130,11 +130,20 @@ Thank you for helping make SnarkVM better! Psi Vesely
Psi Vesely
πŸ’» + swift-mx
swift-mx
πŸ’» Nacho Avecilla
Nacho Avecilla
πŸ’» qy3u
qy3u
πŸ’» Yt
Yt
πŸ’» Kostyan
Kostyan
πŸ’» + stanlagermin
stanlagermin
πŸ’» + Sukey
Sukey
πŸ’» + + + Alex Zhao
Alex Zhao
πŸ’» + ghost ant
ghost ant
πŸ’» + Psi Vesely
Psi Vesely
πŸ’» Dependabot
Dependabot
πŸ’» + Dependabot Preview
Dependabot Preview
πŸ’» All Contributors
All Contributors
πŸ“– From 17c0caba307f707d190dd98d5b282d5e429ad0ec Mon Sep 17 00:00:00 2001 From: collin <16715212+collinc97@users.noreply.github.com> Date: Wed, 29 Nov 2023 10:06:29 -0800 Subject: [PATCH 5/6] fix nit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 54a136fe4a..8acfbc7658 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ snarkvm ## 4. Contributors -Thank you for helping make SnarkVM better! +Thank you for helping make snarkvm better! [🧐 What do the emojis mean?](https://allcontributors.org/docs/en/emoji-key) From fac4006e6aabfb0502588a27803eb5f2afb781c8 Mon Sep 17 00:00:00 2001 From: Howard Wu <9260812+howardwu@users.noreply.github.com> Date: Wed, 29 Nov 2023 15:28:38 -0800 Subject: [PATCH 6/6] Update README.md Signed-off-by: Howard Wu <9260812+howardwu@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8acfbc7658..f1da38327a 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ snarkvm ## 4. Contributors -Thank you for helping make snarkvm better! +Thank you for helping make snarkVM better! [🧐 What do the emojis mean?](https://allcontributors.org/docs/en/emoji-key)