Add more conversions for NoteRecordDetails

0xPolygonMiden · Jul 5, 2024 · 14f63dc · 14f63dc
1 parent be5af12
commit 14f63dc
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 44 deletions.
diff --git a/crates/rust-client/src/notes/mod.rs b/crates/rust-client/src/notes/mod.rs
@@ -6,7 +6,7 @@ use winter_maybe_async::{maybe_async, maybe_await};
 use crate::{
     errors::{ClientError, StoreError},
     rpc::{NodeRpcClient, NoteDetails},
-    store::{InputNoteRecord, NoteFilter, NoteRecordDetails, NoteStatus, OutputNoteRecord, Store},
+    store::{InputNoteRecord, NoteFilter, NoteStatus, OutputNoteRecord, Store},
     Client,
 };
 
@@ -160,12 +160,7 @@ impl<N: NodeRpcClient, R: FeltRng, S: Store, A: TransactionAuthenticator> Client
                     };
 
                     // If note is not tracked, we create a new one.
-                    let details = NoteRecordDetails::new(
-                        node_note.nullifier().to_string(),
-                        node_note.script().clone(),
-                        node_note.inputs().values().to_vec(),
-                        node_note.serial_num(),
-                    );
+                    let details = node_note.clone().into();
 
                     InputNoteRecord::new(
                         node_note.id(),
@@ -196,12 +191,7 @@ impl<N: NodeRpcClient, R: FeltRng, S: Store, A: TransactionAuthenticator> Client
                 }
             },
             NoteFile::NoteDetails(details, None) => {
-                let record_details = NoteRecordDetails::new(
-                    details.nullifier().to_string(),
-                    details.script().clone(),
-                    details.inputs().values().to_vec(),
-                    details.serial_num(),
-                );
+                let record_details = details.clone().into();
 
                 InputNoteRecord::new(
                     details.id(),
@@ -236,12 +226,7 @@ impl<N: NodeRpcClient, R: FeltRng, S: Store, A: TransactionAuthenticator> Client
                     info!("Ignoring note with tag {}", tag);
                 }
 
-                let record_details = NoteRecordDetails::new(
-                    details.nullifier().to_string(),
-                    details.script().clone(),
-                    details.inputs().values().to_vec(),
-                    details.serial_num(),
-                );
+                let record_details = details.clone().into();
 
                 InputNoteRecord::new(
                     details.id(),
@@ -256,12 +241,7 @@ impl<N: NodeRpcClient, R: FeltRng, S: Store, A: TransactionAuthenticator> Client
                 )
             },
             NoteFile::NoteWithProof(note, inclusion_proof) => {
-                let details = NoteRecordDetails::new(
-                    note.nullifier().to_string(),
-                    note.script().clone(),
-                    note.inputs().values().to_vec(),
-                    note.serial_num(),
-                );
+                let details = note.clone().into();
 
                 InputNoteRecord::new(
                     note.id(),

diff --git a/crates/rust-client/src/store/note_record/input_note_record.rs b/crates/rust-client/src/store/note_record/input_note_record.rs
@@ -194,12 +194,7 @@ impl From<Note> for InputNoteRecord {
             status: NoteStatus::Expected { created_at: 0 },
             metadata: Some(*note.metadata()),
             inclusion_proof: None,
-            details: NoteRecordDetails::new(
-                note.nullifier().to_string(),
-                note.script().clone(),
-                note.inputs().values().to_vec(),
-                note.serial_num(),
-            ),
+            details: note.into(),
             ignored: false,
             imported_tag: None,
         }
@@ -214,12 +209,7 @@ impl From<InputNote> for InputNoteRecord {
             assets: recorded_note.note().assets().clone(),
             status: NoteStatus::Expected { created_at: 0 },
             metadata: Some(*recorded_note.note().metadata()),
-            details: NoteRecordDetails::new(
-                recorded_note.note().nullifier().to_string(),
-                recorded_note.note().script().clone(),
-                recorded_note.note().inputs().values().to_vec(),
-                recorded_note.note().serial_num(),
-            ),
+            details: recorded_note.note().clone().into(),
             inclusion_proof: recorded_note.proof().cloned(),
             ignored: false,
             imported_tag: None,

diff --git a/crates/rust-client/src/store/note_record/mod.rs b/crates/rust-client/src/store/note_record/mod.rs
@@ -4,7 +4,7 @@ use chrono::{Local, TimeZone};
 use miden_objects::{
     accounts::AccountId,
     assembly::{Assembler, ProgramAst},
-    notes::NoteScript,
+    notes::{Note, NoteDetails, NoteScript},
     utils::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable},
     Digest, Felt, Word,
 };
@@ -250,3 +250,25 @@ impl Deserializable for NoteRecordDetails {
         Ok(NoteRecordDetails::new(nullifier, script, inputs, serial_num))
     }
 }
+
+impl From<Note> for NoteRecordDetails {
+    fn from(note: Note) -> Self {
+        Self::new(
+            note.nullifier().to_string(),
+            note.script().clone(),
+            note.inputs().values().to_vec(),
+            note.serial_num(),
+        )
+    }
+}
+
+impl From<NoteDetails> for NoteRecordDetails {
+    fn from(details: NoteDetails) -> Self {
+        Self::new(
+            details.nullifier().to_string(),
+            details.script().clone(),
+            details.inputs().values().to_vec(),
+            details.serial_num(),
+        )
+    }
+}
diff --git a/crates/rust-client/src/store/note_record/output_note_record.rs b/crates/rust-client/src/store/note_record/output_note_record.rs
@@ -100,12 +100,7 @@ impl From<Note> for OutputNoteRecord {
             status: NoteStatus::Expected { created_at: 0 },
             metadata: *note.metadata(),
             inclusion_proof: None,
-            details: Some(NoteRecordDetails::new(
-                note.nullifier().to_string(),
-                note.script().clone(),
-                note.inputs().values().to_vec(),
-                note.serial_num(),
-            )),
+            details: Some(note.into()),
         }
     }
 }