Optimize, use default comparisons no need to allocate

Signed-off-by: Raul Metsma <raul@metsma.ee>

Author: metsma

lib/libpcsc-cpp/include/pcsc-cpp/pcsc-cpp.hpp

@@ -92,18 +92,11 @@ struct ResponseApdu
     byte_type sw1 {};
     byte_type sw2 {};
 
-    byte_vector data;
+    byte_vector data {};
 
     static constexpr size_t MAX_DATA_SIZE = 256;
     static constexpr size_t MAX_SIZE = MAX_DATA_SIZE + 2; // + sw1 and sw2
 
-    ResponseApdu(byte_type s1, byte_type s2, byte_vector d = {}) :
-        sw1(s1), sw2(s2), data(std::move(d))
-    {
-    }
-
-    ResponseApdu() = default;
-
     static ResponseApdu fromBytes(byte_vector data)
     {
         if (data.size() < 2) {
@@ -136,6 +129,8 @@ struct ResponseApdu
 
     constexpr bool isOK() const noexcept { return sw1 == OK && sw2 == 0x00; }
 
+    bool operator==(const ResponseApdu& other) const = default;
+
     // TODO: friend function toString() in utilities.hpp
 };
 
@@ -282,14 +277,11 @@ std::vector<Reader> listReaders();
 
 // Utility functions.
 
-extern const byte_vector APDU_RESPONSE_OK;
-
 /** Convert bytes to hex string. */
 std::string bytes2hexstr(const byte_vector& bytes);
 
 /** Transmit APDU command and verify that expected response is received. */
-void transmitApduWithExpectedResponse(const SmartCard& card, const CommandApdu& command,
-                                      const byte_vector& expectedResponseBytes = APDU_RESPONSE_OK);
+void transmitApduWithExpectedResponse(const SmartCard& card, const CommandApdu& command);
 
 /** Read data length from currently selected file header, file must be ASN.1-encoded. */
 size_t readDataLengthFromAsn1(const SmartCard& card);

lib/libpcsc-cpp/src/SmartCard.cpp

@@ -258,7 +258,7 @@ class CardImpl
     {
         byte_vector getResponseCommand {0x00, 0xc0, 0x00, 0x00, 0x00};
 
-        auto newResponse = ResponseApdu(response.sw1, response.sw2);
+        ResponseApdu newResponse{response.sw1, response.sw2};
 
         while (newResponse.sw1 == ResponseApdu::MORE_DATA_AVAILABLE) {
             getResponseCommand[4] = newResponse.sw2;

lib/libpcsc-cpp/src/utils.cpp

@@ -72,8 +72,6 @@ class UnexpectedResponseError : public Error
 namespace pcsc_cpp
 {
 
-const byte_vector APDU_RESPONSE_OK {ResponseApdu::OK, 0x00};
-
 std::string bytes2hexstr(const byte_vector& bytes)
 {
     std::ostringstream hexStringBuilder;
@@ -86,13 +84,13 @@ std::string bytes2hexstr(const byte_vector& bytes)
     return hexStringBuilder.str();
 }
 
-void transmitApduWithExpectedResponse(const SmartCard& card, const CommandApdu& command,
-                                      const byte_vector& expectedResponseBytes)
+void transmitApduWithExpectedResponse(const SmartCard& card, const CommandApdu& command)
 {
+    static const ResponseApdu APDU_RESPONSE_OK {ResponseApdu::OK, 0x00};
     const auto response = card.transmit(command);
-    if (response.toBytes() != expectedResponseBytes) {
-        throw UnexpectedResponseError(command, expectedResponseBytes, response, __FILE__, __LINE__,
-                                      __func__);
+    if (response != APDU_RESPONSE_OK) {
+        throw UnexpectedResponseError(command, APDU_RESPONSE_OK.toBytes(), response, __FILE__,
+                                      __LINE__, __func__);
     }
 }
 

lib/libpcsc-cpp/tests/mock/test-connect-to-card-transmit-apdus.cpp

@@ -62,5 +62,5 @@ TEST(pcsc_cpp_test, transmitApduSuccess)
     auto transactionGuard = card->beginTransaction();
     auto response = card->transmit(command);
 
-    EXPECT_EQ(response.toBytes(), expectedResponse.toBytes());
+    EXPECT_EQ(response, expectedResponse);
 }