From ce0ff468854906b6c8eb1662f109d8d7bd6f4f54 Mon Sep 17 00:00:00 2001
From: thesimplekid <tsk@thesimplekid.com>
Date: Tue, 28 Nov 2023 07:29:13 +0000
Subject: [PATCH] refactor: rename 'SplitPayload' to 'PreSplit'

---
 crates/cashu-sdk/src/wallet.rs | 32 +++++++++++++-------------------
 crates/cashu/src/nuts/mod.rs   |  2 +-
 crates/cashu/src/nuts/nut03.rs |  4 ++--
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/crates/cashu-sdk/src/wallet.rs b/crates/cashu-sdk/src/wallet.rs
index 983e316a..cd6ddb1f 100644
--- a/crates/cashu-sdk/src/wallet.rs
+++ b/crates/cashu-sdk/src/wallet.rs
@@ -5,7 +5,7 @@ use cashu::dhke::{construct_proofs, unblind_message};
 #[cfg(feature = "nut07")]
 use cashu::nuts::nut00::mint;
 use cashu::nuts::{
-    BlindedSignature, Keys, PreMintSecrets, Proof, Proofs, RequestMintResponse, SplitPayload,
+    BlindedSignature, Keys, PreMintSecrets, PreSplit, Proof, Proofs, RequestMintResponse,
     SplitRequest, Token,
 };
 #[cfg(feature = "nut07")]
@@ -155,22 +155,19 @@ impl<C: Client> Wallet<C> {
             // Sum amount of all proofs
             let _amount: Amount = token.proofs.iter().map(|p| p.amount).sum();
 
-            let split_payload = self.create_split(None, token.proofs)?;
+            let pre_split = self.create_split(None, token.proofs)?;
 
             let split_response = self
                 .client
-                .post_split(
-                    self.mint_url.clone().try_into()?,
-                    split_payload.split_payload,
-                )
+                .post_split(self.mint_url.clone().try_into()?, pre_split.split_request)
                 .await?;
 
             if let Some(promises) = &split_response.promises {
                 // Proof to keep
                 let p = construct_proofs(
                     promises.to_owned(),
-                    split_payload.pre_mint_secrets.rs(),
-                    split_payload.pre_mint_secrets.secrets(),
+                    pre_split.pre_mint_secrets.rs(),
+                    pre_split.pre_mint_secrets.secrets(),
                     &keys,
                 )?;
                 proofs.push(p);
@@ -183,7 +180,7 @@ impl<C: Client> Wallet<C> {
     }
 
     /// Create Split Payload
-    fn create_split(&self, amount: Option<Amount>, proofs: Proofs) -> Result<SplitPayload, Error> {
+    fn create_split(&self, amount: Option<Amount>, proofs: Proofs) -> Result<PreSplit, Error> {
         // Since split is used to get the needed combination of tokens for a specific
         // amount first blinded messages are created for the amount
 
@@ -204,11 +201,11 @@ impl<C: Client> Wallet<C> {
             PreMintSecrets::random((&self.mint_keys).into(), value)?
         };
 
-        let split_payload = SplitRequest::new(proofs, pre_mint_secrets.blinded_messages());
+        let split_request = SplitRequest::new(proofs, pre_mint_secrets.blinded_messages());
 
-        Ok(SplitPayload {
+        Ok(PreSplit {
             pre_mint_secrets,
-            split_payload,
+            split_request,
         })
     }
 
@@ -251,14 +248,11 @@ impl<C: Client> Wallet<C> {
             return Err(Error::InsufficientFunds);
         }
 
-        let split_payload = self.create_split(Some(amount), proofs)?;
+        let pre_split = self.create_split(Some(amount), proofs)?;
 
         let split_response = self
             .client
-            .post_split(
-                self.mint_url.clone().try_into()?,
-                split_payload.split_payload,
-            )
+            .post_split(self.mint_url.clone().try_into()?, pre_split.split_request)
             .await?;
 
         let mut keep_proofs = Proofs::new();
@@ -267,8 +261,8 @@ impl<C: Client> Wallet<C> {
         if let Some(promises) = split_response.promises {
             let mut proofs = construct_proofs(
                 promises,
-                split_payload.pre_mint_secrets.rs(),
-                split_payload.pre_mint_secrets.secrets(),
+                pre_split.pre_mint_secrets.rs(),
+                pre_split.pre_mint_secrets.secrets(),
                 &self.mint_keys,
             )?;
 
diff --git a/crates/cashu/src/nuts/mod.rs b/crates/cashu/src/nuts/mod.rs
index bb5e7bf4..9e96d67f 100644
--- a/crates/cashu/src/nuts/mod.rs
+++ b/crates/cashu/src/nuts/mod.rs
@@ -18,7 +18,7 @@ pub use nut01::{Keys, KeysResponse, PublicKey, SecretKey};
 pub use nut02::mint::KeySet as MintKeySet;
 pub use nut02::{Id, KeySet, KeySetInfo, KeysetResponse};
 #[cfg(feature = "wallet")]
-pub use nut03::SplitPayload;
+pub use nut03::PreSplit;
 pub use nut03::{RequestMintResponse, SplitRequest, SplitResponse};
 pub use nut04::{MintRequest, PostMintResponse};
 pub use nut05::{CheckFeesRequest, CheckFeesResponse};
diff --git a/crates/cashu/src/nuts/nut03.rs b/crates/cashu/src/nuts/nut03.rs
index 0dd16c50..5c9ab866 100644
--- a/crates/cashu/src/nuts/nut03.rs
+++ b/crates/cashu/src/nuts/nut03.rs
@@ -21,9 +21,9 @@ pub struct RequestMintResponse {
 
 #[cfg(feature = "wallet")]
 #[derive(Debug, Clone, PartialEq, Eq, Serialize)]
-pub struct SplitPayload {
+pub struct PreSplit {
     pub pre_mint_secrets: PreMintSecrets,
-    pub split_payload: SplitRequest,
+    pub split_request: SplitRequest,
 }
 
 /// Split Request [NUT-06]