logos-co
/
nomos-specs
mirror of https://github.com/logos-co/nomos-specs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cl: rename Note to NoteWitness

This commit is contained in:
David Rusu 2024-06-26 14:14:56 -04:00
parent bbc7914aa9
commit a6bbd56f64
5 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cl/src/bundle.rs
View File

@ -87,7 +87,7 @@ impl Bundle {
#[cfg(test)]
mod test {
use crate::{
input::InputWitness, note::Note, nullifier::NullifierSecret, output::OutputWitness,
input::InputWitness, note::NoteWitness, nullifier::NullifierSecret, output::OutputWitness,
test_util::seed_rng,
};
@ -97,10 +97,10 @@ mod test {
fn test_bundle_balance() {
let mut rng = seed_rng(0);
let nmo_10_in = InputWitness::random(Note::random(10, "NMO", &mut rng), &mut rng);
let eth_23_in = InputWitness::random(Note::random(23, "ETH", &mut rng), &mut rng);
let nmo_10_in = InputWitness::random(NoteWitness::random(10, "NMO", &mut rng), &mut rng);
let eth_23_in = InputWitness::random(NoteWitness::random(23, "ETH", &mut rng), &mut rng);
let crv_4840_out = OutputWitness::random(
Note::random(4840, "CRV", &mut rng),
NoteWitness::random(4840, "CRV", &mut rng),
NullifierSecret::random(&mut rng).commit(), // transferring to a random owner
&mut rng,
);
@ -125,14 +125,15 @@ mod test {
+ crate::balance::balance(23, "ETH", eth_23_in.note.balance.blinding))
);
let crv_4840_in = InputWitness::random(Note::random(4840, "CRV", &mut rng), &mut rng);
let crv_4840_in =
InputWitness::random(NoteWitness::random(4840, "CRV", &mut rng), &mut rng);
let nmo_10_out = OutputWitness::random(
Note::random(10, "NMO", &mut rng),
NoteWitness::random(10, "NMO", &mut rng),
NullifierSecret::random(&mut rng).commit(), // transferring to a random owner
&mut rng,
);
let eth_23_out = OutputWitness::random(
Note::random(23, "ETH", &mut rng),
NoteWitness::random(23, "ETH", &mut rng),
NullifierSecret::random(&mut rng).commit(), // transferring to a random owner
&mut rng,
);

14
cl/src/input.rs
View File

@ -5,7 +5,7 @@
use crate::{
balance::Balance,
error::Error,
note::{Note, NoteCommitment},
note::{NoteCommitment, NoteWitness},
nullifier::{Nullifier, NullifierNonce, NullifierSecret},
partial_tx::PtxCommitment,
};
@ -22,13 +22,13 @@ pub struct Input {
#[derive(Debug, Clone)]
pub struct InputWitness {
pub note: Note,
pub note: NoteWitness,
pub nf_sk: NullifierSecret,
pub nonce: NullifierNonce,
}
impl InputWitness {
pub fn random(note: Note, mut rng: impl RngCore) -> Self {
pub fn random(note: NoteWitness, mut rng: impl RngCore) -> Self {
Self {
note,
nf_sk: NullifierSecret::random(&mut rng),
@ -133,7 +133,7 @@ mod test {
let ptx_comm = PtxCommitment::default();
let note = Note::random(10, "NMO", &mut rng);
let note = NoteWitness::random(10, "NMO", &mut rng);
let nf_sk = NullifierSecret::random(&mut rng);
let nonce = NullifierNonce::random(&mut rng);
@ -146,11 +146,11 @@ mod test {
let wrong_witnesses = [
InputWitness {
note: Note::random(11, "NMO", &mut rng),
note: NoteWitness::random(11, "NMO", &mut rng),
..witness.clone()
},
InputWitness {
note: Note::random(10, "ETH", &mut rng),
note: NoteWitness::random(10, "ETH", &mut rng),
..witness.clone()
},
InputWitness {
@ -176,7 +176,7 @@ mod test {
fn test_input_ptx_coupling() {
let mut rng = seed_rng(0);
let note = Note::random(10, "NMO", &mut rng);
let note = NoteWitness::random(10, "NMO", &mut rng);
let nf_sk = NullifierSecret::random(&mut rng);
let nonce = NullifierNonce::random(&mut rng);

8
cl/src/note.rs
View File

@ -21,12 +21,12 @@ impl NoteCommitment {
// TODO: Rename Note to NoteWitness and NoteCommitment to Note
#[derive(Debug, Clone)]
pub struct Note {
pub struct NoteWitness {
pub balance: BalanceWitness,
pub death_constraint: Vec<u8>, // serialized death_constraint
}
impl Note {
impl NoteWitness {
pub fn random(
value: u64,
unit: impl Into<String>,
@ -73,8 +73,8 @@ mod test {
#[test]
fn test_note_commitments_dont_commit_to_balance_blinding() {
let mut rng = seed_rng(0);
let n1 = Note::random(12, "NMO", &mut rng);
let n2 = Note::random(12, "NMO", &mut rng);
let n1 = NoteWitness::random(12, "NMO", &mut rng);
let n2 = NoteWitness::random(12, "NMO", &mut rng);
let nf_pk = NullifierSecret::random(&mut rng).commit();
let nonce = NullifierNonce::random(&mut rng);

12
cl/src/output.rs
View File

@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
use crate::{
balance::Balance,
error::Error,
note::{Note, NoteCommitment},
note::{NoteCommitment, NoteWitness},
nullifier::{NullifierCommitment, NullifierNonce},
};
@ -16,13 +16,13 @@ pub struct Output {
#[derive(Debug, Clone)]
pub struct OutputWitness {
pub note: Note,
pub note: NoteWitness,
pub nf_pk: NullifierCommitment,
pub nonce: NullifierNonce,
}
impl OutputWitness {
pub fn random(note: Note, owner: NullifierCommitment, mut rng: impl RngCore) -> Self {
pub fn random(note: NoteWitness, owner: NullifierCommitment, mut rng: impl RngCore) -> Self {
Self {
note,
nf_pk: owner,
@ -78,7 +78,7 @@ mod test {
fn test_output_proof() {
let mut rng = seed_rng(0);
let note = Note::random(10, "NMO", &mut rng);
let note = NoteWitness::random(10, "NMO", &mut rng);
let nf_pk = NullifierSecret::random(&mut rng).commit();
let nonce = NullifierNonce::random(&mut rng);
@ -91,11 +91,11 @@ mod test {
let wrong_witnesses = [
OutputWitness {
note: Note::random(11, "NMO", &mut rng),
note: NoteWitness::random(11, "NMO", &mut rng),
..witness.clone()
},
OutputWitness {
note: Note::random(10, "ETH", &mut rng),
note: NoteWitness::random(10, "ETH", &mut rng),
..witness.clone()
},
OutputWitness {

14
cl/src/partial_tx.rs
View File

@ -138,7 +138,7 @@ impl PartialTx {
#[cfg(test)]
mod test {
use crate::{note::Note, nullifier::NullifierSecret, test_util::seed_rng};
use crate::{note::NoteWitness, nullifier::NullifierSecret, test_util::seed_rng};
use super::*;
@ -146,10 +146,10 @@ mod test {
fn test_partial_tx_proof() {
let mut rng = seed_rng(0);
let nmo_10 = InputWitness::random(Note::random(10, "NMO", &mut rng), &mut rng);
let eth_23 = InputWitness::random(Note::random(23, "ETH", &mut rng), &mut rng);
let nmo_10 = InputWitness::random(NoteWitness::random(10, "NMO", &mut rng), &mut rng);
let eth_23 = InputWitness::random(NoteWitness::random(23, "ETH", &mut rng), &mut rng);
let crv_4840 = OutputWitness::random(
Note::random(4840, "CRV", &mut rng),
NoteWitness::random(4840, "CRV", &mut rng),
NullifierSecret::random(&mut rng).commit(), // transferring to a random owner
&mut rng,
);
@ -170,10 +170,10 @@ mod test {
fn test_partial_tx_balance() {
let mut rng = seed_rng(0);
let nmo_10 = InputWitness::random(Note::random(10, "NMO", &mut rng), &mut rng);
let eth_23 = InputWitness::random(Note::random(23, "ETH", &mut rng), &mut rng);
let nmo_10 = InputWitness::random(NoteWitness::random(10, "NMO", &mut rng), &mut rng);
let eth_23 = InputWitness::random(NoteWitness::random(23, "ETH", &mut rng), &mut rng);
let crv_4840 = OutputWitness::random(
Note::random(4840, "CRV", &mut rng),
NoteWitness::random(4840, "CRV", &mut rng),
NullifierSecret::random(&mut rng).commit(), // transferring to a random owner
&mut rng,
);