From f1f4533332bad2d4336fa19b459226c1f79cb32c Mon Sep 17 00:00:00 2001
From: Heiko Schaefer <heiko@schaefer.name>
Date: Wed, 16 Feb 2022 17:46:26 +0100
Subject: [PATCH] Remove TxClient::tx() from API; clean up uses.

---
 pcsc/src/lib.rs | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/pcsc/src/lib.rs b/pcsc/src/lib.rs
index 91e5dec..3914574 100644
--- a/pcsc/src/lib.rs
+++ b/pcsc/src/lib.rs
@@ -97,7 +97,7 @@ impl<'b> TxClient<'b> {
                             TxClient::select(&mut txc)?;
                         }
 
-                        tx = txc.tx();
+                        tx = txc.tx;
                     }
 
                     let txc = Self {
@@ -207,10 +207,6 @@ impl<'b> TxClient<'b> {
             Err(anyhow!("card_caps is None"))
         }
     }
-
-    pub fn tx(self) -> Transaction<'b> {
-        self.tx
-    }
 }
 
 impl CardClient for TxClient<'_> {
@@ -570,19 +566,10 @@ impl PcscCard {
                         // successfully opened the OpenPGP application
 
                         // -- debug: status --
-                        let tx = txc.tx();
-                        let stat = tx.status2_owned().map_err(|e| {
-                            Error::Smartcard(SmartcardError::Error(format!(
-                                "{:?}",
-                                e
-                            )))
-                        })?;
-                        log::debug!("4b card status: {:x?}", stat);
-                        txc = TxClient {
-                            tx,
-                            card_caps: None,
-                            reader_caps: HashMap::default(),
-                        };
+                        log::debug!(
+                            "4b card status: {:x?}",
+                            txc.tx.status2_owned()
+                        );
 
                         // -- /debug: status --