Move payment to id

utxo/src/id/mod.rs

@@ -1,13 +1,7 @@
-use crate::PaymentId;
 use serde::{de, Deserialize, Deserializer, Serialize};
 use sha2::{Digest, Sha256};
 use std::{fmt::Display, ops::Deref, str::FromStr};
 
-mod binary;
-mod error;
-
-pub use error::Error;
-
 #[derive(Clone, Debug, Eq, Hash, Ord, PartialOrd, PartialEq, Serialize)]
 /// A string with a max-length checked at compiled time
 pub struct MaxLengthString<const MAX_LENGTH: usize>(String);
@@ -111,3 +105,9 @@ impl<'de> Deserialize<'de> for AnyId {
         AnyId::from_str(&s).map_err(serde::de::Error::custom)
     }
 }
+
+mod binary;
+mod error;
+mod payment;
+
+pub use self::{error::Error, payment::PaymentId};

utxo/src/id/payment.rs

@@ -0,0 +1,93 @@
+use crate::{id::Error, TransactionId};
+use serde::{de, Serialize, Serializer};
+use std::{fmt, ops::Deref, str::FromStr};
+
+#[derive(Clone, Debug, Eq, Ord, Hash, PartialOrd, PartialEq)]
+/// PaymentID
+///
+/// This is the payment ID. The payment ID has two public members, which is
+/// basically the transaction which created this payment and the position in the
+/// transaction.
+pub struct PaymentId {
+    /// Transaction which created this payment
+    pub transaction: TransactionId,
+    /// This payment position inside the transaction
+    pub position: u16,
+}
+
+impl FromStr for PaymentId {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let parts: Vec<&str> = s.split(':').collect();
+        if parts.len() != 2 {
+            return Err(Error::InvalidLength(
+                "payment_id".to_owned(),
+                2,
+                parts.len(),
+            ));
+        }
+
+        let transaction = parts[0].try_into()?;
+        let position = parts[1].parse()?;
+
+        Ok(PaymentId {
+            transaction,
+            position,
+        })
+    }
+}
+
+impl PaymentId {
+    /// Returns the bytes representation of the PaymentId
+    pub fn bytes(&self) -> [u8; 34] {
+        let mut bytes = [0u8; 34];
+        bytes[0..32].copy_from_slice(self.transaction.deref());
+        bytes[32..34].copy_from_slice(&self.position.to_be_bytes());
+        bytes
+    }
+}
+
+impl Serialize for PaymentId {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let serialized = self.to_string();
+        serializer.serialize_str(&serialized)
+    }
+}
+
+impl ToString for PaymentId {
+    fn to_string(&self) -> String {
+        format!("{}:{}", self.transaction, self.position)
+    }
+}
+
+struct PaymentIdVisitor;
+
+impl<'de> de::Visitor<'de> for PaymentIdVisitor {
+    type Value = PaymentId;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter.write_str("a string in the format 'transaction_id:position'")
+    }
+
+    fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
+    where
+        E: de::Error,
+    {
+        value
+            .parse()
+            .map_err(|e: Error| E::custom(format!("Invalid payment ID: {}", e)))
+    }
+}
+
+impl<'de> de::Deserialize<'de> for PaymentId {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: de::Deserializer<'de>,
+    {
+        deserializer.deserialize_str(PaymentIdVisitor)
+    }
+}

utxo/src/lib.rs

@@ -45,7 +45,7 @@ pub use self::{
     error::Error,
     id::*,
     ledger::Ledger,
-    payment::{PaymentFrom, PaymentId},
+    payment::PaymentFrom,
     serde::*,
     status::Status,
     transaction::{Transaction, Type},

utxo/src/payment.rs

@@ -1,96 +1,5 @@
-use crate::{id::Error, AccountId, Amount, TransactionId};
-use serde::{de, Deserialize, Serialize, Serializer};
-use std::{fmt, ops::Deref, str::FromStr};
-
-#[derive(Clone, Debug, Eq, Ord, Hash, PartialOrd, PartialEq)]
-/// PaymentID
-///
-/// This is the payment ID. The payment ID has two public members, which is
-/// basically the transaction which created this payment and the position in the
-/// transaction.
-pub struct PaymentId {
-    /// Transaction which created this payment
-    pub transaction: TransactionId,
-    /// This payment position inside the transaction
-    pub position: u16,
-}
-
-impl FromStr for PaymentId {
-    type Err = Error;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let parts: Vec<&str> = s.split(':').collect();
-        if parts.len() != 2 {
-            return Err(Error::InvalidLength(
-                "payment_id".to_owned(),
-                2,
-                parts.len(),
-            ));
-        }
-
-        let transaction = parts[0].try_into()?;
-        let position = parts[1].parse()?;
-
-        Ok(PaymentId {
-            transaction,
-            position,
-        })
-    }
-}
-
-impl PaymentId {
-    /// Returns the bytes representation of the PaymentId
-    pub fn bytes(&self) -> [u8; 34] {
-        let mut bytes = [0u8; 34];
-        bytes[0..32].copy_from_slice(self.transaction.deref());
-        bytes[32..34].copy_from_slice(&self.position.to_be_bytes());
-        bytes
-    }
-}
-
-impl Serialize for PaymentId {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let serialized = self.to_string();
-        serializer.serialize_str(&serialized)
-    }
-}
-
-impl ToString for PaymentId {
-    fn to_string(&self) -> String {
-        format!("{}:{}", self.transaction, self.position)
-    }
-}
-
-struct PaymentIdVisitor;
-
-impl<'de> de::Visitor<'de> for PaymentIdVisitor {
-    type Value = PaymentId;
-
-    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        formatter.write_str("a string in the format 'transaction_id:position'")
-    }
-
-    fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
-    where
-        E: de::Error,
-    {
-        value
-            .parse()
-            .map_err(|e: Error| E::custom(format!("Invalid payment ID: {}", e)))
-    }
-}
-
-impl<'de> de::Deserialize<'de> for PaymentId {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: de::Deserializer<'de>,
-    {
-        deserializer.deserialize_str(PaymentIdVisitor)
-    }
-}
+use crate::{AccountId, Amount, PaymentId};
+use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Eq, PartialEq, Deserialize, Serialize)]
 pub struct PaymentTo {