Skip to content

Implemented checked multiplication for ValueSums. #94

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

Merged
tzemanovic merged 1 commit into from
Mar 20, 2025
Merged

Implemented checked multiplication for ValueSums. #94

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 16 additions & 5 deletions masp_primitives/src/transaction/components/amount.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,15 +440,26 @@ where
type Output = ValueSum<Unit, <Lhs as CheckedMul<Rhs>>::Output>;

fn mul(self, rhs: Rhs) -> Self::Output {
self.checked_mul(rhs).expect("overflow detected")
}
}

impl<Unit, Lhs, Rhs> CheckedMul<Rhs> for ValueSum<Unit, Lhs>
where
Unit: Hash + Ord + BorshSerialize + BorshDeserialize + Clone,
Lhs: BorshSerialize + BorshDeserialize + PartialEq + Eq + Copy + Default + CheckedMul<Rhs>,
Rhs: Copy,
<Lhs as CheckedMul<Rhs>>::Output: Default + BorshSerialize + BorshDeserialize + Eq,
{
type Output = ValueSum<Unit, <Lhs as CheckedMul<Rhs>>::Output>;

fn checked_mul(self, rhs: Rhs) -> Option<Self::Output> {
let mut comps = BTreeMap::new();
for (atype, amount) in self.0.iter() {
comps.insert(
atype.clone(),
amount.checked_mul(rhs).expect("overflow detected"),
);
comps.insert(atype.clone(), amount.checked_mul(rhs)?);
}
comps.retain(|_, v| *v != <Lhs as CheckedMul<Rhs>>::Output::default());
ValueSum(comps)
Some(ValueSum(comps))
}
}

Expand Down
Loading