mirror of
https://github.com/darkrenaissance/darkfi.git
synced 2026-01-08 22:28:12 -05:00
chore: replaced all MerkleTree::new(100) with MerkleTree::new(1) for consistency
This commit is contained in:
@@ -61,7 +61,7 @@ impl Rln {
|
||||
|
||||
if !identities.contains_key(b"identity_tree")? {
|
||||
info!("Creating RLN membership tree");
|
||||
let membership_tree = MerkleTree::new(100);
|
||||
let membership_tree = MerkleTree::new(1);
|
||||
identities.insert(b"identity_tree", serialize_async(&membership_tree).await)?;
|
||||
}
|
||||
|
||||
|
||||
@@ -379,7 +379,7 @@ impl Drk {
|
||||
.is_err()
|
||||
{
|
||||
println!("Initializing DAO Merkle trees");
|
||||
let tree = MerkleTree::new(100);
|
||||
let tree = MerkleTree::new(1);
|
||||
self.put_dao_trees(&tree, &tree).await?;
|
||||
println!("Successfully initialized Merkle trees for the DAO contract");
|
||||
}
|
||||
@@ -1018,7 +1018,7 @@ impl Drk {
|
||||
/// Reset the DAO Merkle trees in the wallet.
|
||||
pub async fn reset_dao_trees(&self) -> WalletDbResult<()> {
|
||||
println!("Resetting DAO Merkle trees");
|
||||
let tree = MerkleTree::new(100);
|
||||
let tree = MerkleTree::new(1);
|
||||
self.put_dao_trees(&tree, &tree).await?;
|
||||
println!("Successfully reset DAO Merkle trees");
|
||||
|
||||
|
||||
@@ -116,7 +116,7 @@ impl Drk {
|
||||
// we should actually check it.
|
||||
if self.get_money_tree().await.is_err() {
|
||||
println!("Initializing Money Merkle tree");
|
||||
let mut tree = MerkleTree::new(100);
|
||||
let mut tree = MerkleTree::new(1);
|
||||
tree.append(MerkleNode::from(pallas::Base::ZERO));
|
||||
let _ = tree.mark().unwrap();
|
||||
self.put_money_tree(&tree).await?;
|
||||
@@ -839,7 +839,7 @@ impl Drk {
|
||||
/// Reset the Money Merkle tree in the wallet
|
||||
pub async fn reset_money_tree(&self) -> WalletDbResult<()> {
|
||||
println!("Resetting Money Merkle tree");
|
||||
let mut tree = MerkleTree::new(100);
|
||||
let mut tree = MerkleTree::new(1);
|
||||
tree.append(MerkleNode::from(pallas::Base::ZERO));
|
||||
let _ = tree.mark().unwrap();
|
||||
self.put_money_tree(&tree).await?;
|
||||
|
||||
@@ -37,7 +37,7 @@ use halo2_proofs::circuit::Value;
|
||||
use rand::rngs::OsRng;
|
||||
|
||||
fn main() -> Result<()> {
|
||||
let mut tree = MerkleTree::new(100);
|
||||
let mut tree = MerkleTree::new(1);
|
||||
|
||||
// Add 10 random things to the tree
|
||||
for _ in 0..10 {
|
||||
|
||||
@@ -77,7 +77,7 @@ fn main() {
|
||||
// ============
|
||||
// Registration
|
||||
// ============
|
||||
let mut membership_tree = MerkleTree::new(100);
|
||||
let mut membership_tree = MerkleTree::new(1);
|
||||
let mut identity_roots: Vec<MerkleNode> = vec![];
|
||||
let mut banned_roots: Vec<MerkleNode> = vec![];
|
||||
let mut identities = HashMap::new();
|
||||
|
||||
@@ -71,7 +71,7 @@ fn hash_message(msg: &str) -> pallas::Base {
|
||||
fn main() {
|
||||
// There exists a Merkle tree of identity commitments that serves
|
||||
// as the user registry.
|
||||
let mut membership_tree = MerkleTree::new(100);
|
||||
let mut membership_tree = MerkleTree::new(1);
|
||||
// Since bridgetree is append-only, we'll maintain a BTreeMap of all the
|
||||
// identity commitments in their indexes and whenever some idenity is banned
|
||||
// we'll zero out that leaf and rebuild the bridgetree from the BTreeMap.
|
||||
|
||||
@@ -93,7 +93,7 @@ fn init_contract(cid: ContractId, _ix: &[u8]) -> ContractResult {
|
||||
}
|
||||
None => {
|
||||
// We didn't find a tree, so just make a new one.
|
||||
let tree = MerkleTree::new(100);
|
||||
let tree = MerkleTree::new(1);
|
||||
|
||||
let mut tree_data = vec![];
|
||||
tree_data.write_u32(0)?;
|
||||
|
||||
@@ -171,7 +171,7 @@ fn init_contract(cid: ContractId, _ix: &[u8]) -> ContractResult {
|
||||
|
||||
// Create the incrementalmerkletree for seen coins and initialize
|
||||
// it with a "fake" coin that can be used for dummy inputs.
|
||||
let mut coin_tree = MerkleTree::new(100);
|
||||
let mut coin_tree = MerkleTree::new(1);
|
||||
coin_tree.append(MerkleNode::from(pallas::Base::ZERO));
|
||||
let mut coin_tree_data = vec![];
|
||||
coin_tree_data.write_u32(0)?;
|
||||
|
||||
@@ -173,7 +173,7 @@ impl Wallet {
|
||||
|
||||
// The Merkle tree for the `Money` contract is initialized with a "null"
|
||||
// leaf at position 0.
|
||||
let mut money_merkle_tree = MerkleTree::new(100);
|
||||
let mut money_merkle_tree = MerkleTree::new(1);
|
||||
money_merkle_tree.append(MerkleNode::from(pallas::Base::ZERO));
|
||||
money_merkle_tree.mark().unwrap();
|
||||
|
||||
@@ -189,8 +189,8 @@ impl Wallet {
|
||||
money_merkle_tree,
|
||||
money_null_smt,
|
||||
money_null_smt_snapshot: None,
|
||||
dao_merkle_tree: MerkleTree::new(100),
|
||||
dao_proposals_tree: MerkleTree::new(100),
|
||||
dao_merkle_tree: MerkleTree::new(1),
|
||||
dao_proposals_tree: MerkleTree::new(1),
|
||||
unspent_money_coins: vec![],
|
||||
spent_money_coins: vec![],
|
||||
dao_leafs: HashMap::new(),
|
||||
|
||||
@@ -30,7 +30,7 @@ pub struct MerkleTree(merkle_node::MerkleTree);
|
||||
impl MerkleTree {
|
||||
#[new]
|
||||
fn new() -> Self {
|
||||
Self(merkle_node::MerkleTree::new(100))
|
||||
Self(merkle_node::MerkleTree::new(1))
|
||||
}
|
||||
|
||||
fn append(&mut self, node: &PyCell<Fp>) -> PyResult<bool> {
|
||||
|
||||
@@ -94,7 +94,7 @@ fn halo2_vk_ser() -> Result<()> {
|
||||
let a = pallas::Base::from(42);
|
||||
let b = pallas::Base::from(69);
|
||||
|
||||
let mut tree = MerkleTree::new(100);
|
||||
let mut tree = MerkleTree::new(1);
|
||||
let c0 = pallas::Base::random(&mut OsRng);
|
||||
let c1 = pallas::Base::random(&mut OsRng);
|
||||
let c3 = pallas::Base::random(&mut OsRng);
|
||||
|
||||
@@ -56,7 +56,7 @@ fn zkvm_opcodes() -> Result<()> {
|
||||
let a = pallas::Base::from(42);
|
||||
let b = pallas::Base::from(69);
|
||||
|
||||
let mut tree = MerkleTree::new(100);
|
||||
let mut tree = MerkleTree::new(1);
|
||||
let c0 = pallas::Base::random(&mut OsRng);
|
||||
let c1 = pallas::Base::random(&mut OsRng);
|
||||
let c3 = pallas::Base::random(&mut OsRng);
|
||||
|
||||
Reference in New Issue
Block a user