From c9ebfd11194de83ed9de0d0fff7b0abe32f92d0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Mon, 15 Jun 2020 18:33:04 -0400
Subject: [PATCH] tests: cleanup

---
 tests/cryptotester.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/cryptotester.cpp b/tests/cryptotester.cpp
index 21169a1b..bf092c85 100644
--- a/tests/cryptotester.cpp
+++ b/tests/cryptotester.cpp
@@ -138,7 +138,7 @@ CryptoTester::testCertificateRequest()
 
 void CryptoTester::testCertificateSerialNumber()
 {
-    std::string cert_pem = "-----BEGIN CERTIFICATE-----"
+    static const std::string cert_pem = "-----BEGIN CERTIFICATE-----"
 "MIICDjCCAZSgAwIBAgIIS90uAKp+u/swCgYIKoZIzj0EAwMwTDEQMA4GA1UEAxMH"
 "ZGh0bm9kZTE4MDYGCgmSJomT8ixkAQETKDBlNDQxZTA4YWJmYTQzYTc3ZTVjZDBm"
 "Y2QzMzAzMTc4MjYxMTk0MzIwHhcNMTkxMTA3MDA0MTMwWhcNMjkxMTA0MDA0MTMw"
@@ -152,15 +152,13 @@ void CryptoTester::testCertificateSerialNumber()
 "AjBgxXyXYqn0d7vz7S6oAY5TdaD5YFT5MD2c1MAAp8pxQSwdPa9k0ZSoGIEn31Z0"
 "GxU="
 "-----END CERTIFICATE-----";
-    auto identity = dht::crypto::generateIdentity();
-    identity.second = std::make_shared<dht::crypto::Certificate>(cert_pem);
     /*
      * $ openssl x509 -in cert.pem  -noout -serial
      * serial=4BDD2E00AA7EBBFB
      */
-    dht::Blob serial {{0x4b,0xdd,0x2e,0x00,0xaa,0x7e,0xbb,0xfb}};
-    auto blob = identity.second->getSerialNumber();
-    CPPUNIT_ASSERT(serial == blob);
+    static constexpr std::array<uint8_t, 8> SERIAL {{0x4b,0xdd,0x2e,0x00,0xaa,0x7e,0xbb,0xfb}};
+    auto serial = dht::crypto::Certificate(cert_pem).getSerialNumber();
+    CPPUNIT_ASSERT(std::equal(SERIAL.begin(), SERIAL.end(), serial.begin(), serial.end()));
 }
 
 void
-- 
GitLab