Removing with data types due to discussion on mcip/60

mobilecoinfoundation · Mar 23, 2023 · 962582a · 962582a
1 parent 31f5858
commit 962582a
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 347 deletions.
diff --git a/fog/sample-paykit/src/cached_tx_data/memo_handler.rs b/fog/sample-paykit/src/cached_tx_data/memo_handler.rs
@@ -86,21 +86,6 @@ impl MemoHandler {
                     Err(MemoHandlerError::UnknownSender)
                 }
             }
-            MemoType::AuthenticatedSenderWithData(memo) => {
-                if let Some(addr) = self.contacts.get(&memo.sender_address_hash()) {
-                    if bool::from(memo.validate(
-                        addr,
-                        &account_key.default_subaddress_view_private(),
-                        &tx_out.public_key,
-                    )) {
-                        Ok(Some(memo_type))
-                    } else {
-                        Err(MemoHandlerError::FailedHmacValidation)
-                    }
-                } else {
-                    Err(MemoHandlerError::UnknownSender)
-                }
-            }
             MemoType::AuthenticatedSenderWithPaymentIntentId(memo) => {
                 if let Some(addr) = self.contacts.get(&memo.sender_address_hash()) {
                     if bool::from(memo.validate(
@@ -138,13 +123,6 @@ impl MemoHandler {
                     Err(MemoHandlerError::FailedSubaddressValidation)
                 }
             }
-            MemoType::DestinationWithData(_) => {
-                if subaddress_matches_tx_out(account_key, CHANGE_SUBADDRESS_INDEX, tx_out)? {
-                    Ok(Some(memo_type))
-                } else {
-                    Err(MemoHandlerError::FailedSubaddressValidation)
-                }
-            }
             MemoType::DestinationWithPaymentRequestId(_) => {
                 if subaddress_matches_tx_out(account_key, CHANGE_SUBADDRESS_INDEX, tx_out)? {
                     Ok(Some(memo_type))

diff --git a/transaction/extra/src/lib.rs b/transaction/extra/src/lib.rs
@@ -21,10 +21,9 @@ mod unsigned_tx;
 
 pub use memo::{
     compute_authenticated_sender_memo, compute_destination_memo, AuthenticatedSenderMemo,
-    AuthenticatedSenderWithDataMemo, AuthenticatedSenderWithPaymentIntentIdMemo,
-    AuthenticatedSenderWithPaymentRequestIdMemo, BurnRedemptionMemo, DefragmentationMemo,
-    DefragmentationMemoError, DestinationMemo, DestinationMemoError, DestinationWithDataMemo,
-    DestinationWithPaymentIntentIdMemo, DestinationWithPaymentRequestIdMemo,
+    AuthenticatedSenderWithPaymentIntentIdMemo, AuthenticatedSenderWithPaymentRequestIdMemo,
+    BurnRedemptionMemo, DefragmentationMemo, DefragmentationMemoError, DestinationMemo,
+    DestinationMemoError, DestinationWithPaymentIntentIdMemo, DestinationWithPaymentRequestIdMemo,
     GiftCodeCancellationMemo, GiftCodeFundingMemo, GiftCodeSenderMemo, MemoDecodingError, MemoType,
     RegisteredMemoType, SenderMemoCredential, UnusedMemo,
 };

diff --git a/transaction/extra/src/memo/authenticated_sender_with_data.rs b/transaction/extra/src/memo/authenticated_sender_with_data.rs
diff --git a/transaction/extra/src/memo/destination_with_data.rs b/transaction/extra/src/memo/destination_with_data.rs