Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add necessary trait bounds to balanced merkle tree #5232

Merged
merged 10 commits into from
Mar 10, 2023
Merged

feat: add necessary trait bounds to balanced merkle tree #5232

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0acc946
add necessary trait bounds to bmt
jorgeantonio21 Mar 8, 2023
41004b9
add further trait bounds
jorgeantonio21 Mar 8, 2023
511744f
refactor use of usize to u32 in bmt, add borsh derives to bmt proof type
jorgeantonio21 Mar 8, 2023
9af46b6
Merge remote-tracking branch 'origin/development' into ja-derive-trai…
jorgeantonio21 Mar 9, 2023
7f68268
merge development and remove u32 as cast
jorgeantonio21 Mar 9, 2023
aee3983
Merge branch 'development' into ja-derive-trait-bounds-for-bmt
jorgeantonio21 Mar 9, 2023
8b5ae46
simplified u32 cast logic and address PR comments
jorgeantonio21 Mar 9, 2023
65d1354
address failing ci
jorgeantonio21 Mar 9, 2023
c235301
renaming bbm proof error type
jorgeantonio21 Mar 9, 2023
90d14df
Merge branch 'development' into ja-derive-trait-bounds-for-bmt
sdbondi Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion base_layer/mmr/src/balanced_binary_merkle_proof.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@
use std::{collections::HashMap, convert::TryInto, marker::PhantomData};

use digest::Digest;
use serde::{Deserialize, Serialize};
use tari_common::DomainDigest;
use tari_utilities::ByteArray;
use thiserror::Error;

use crate::{common::hash_together, BalancedBinaryMerkleTree, Hash};

#[derive(Debug)]
#[derive(Deserialize, Serialize, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Default)]
jorgeantonio21 marked this conversation as resolved.
Show resolved Hide resolved
pub struct BalancedBinaryMerkleProof<D> {
pub path: Vec<Hash>,
pub node_index: usize,
jorgeantonio21 marked this conversation as resolved.
Show resolved Hide resolved
Expand Down