From 5c47cee552c8297234c894e2f1f67e06fa0b038b Mon Sep 17 00:00:00 2001
From: Aaron Fiore <founder@evergreencrypto.co>
Date: Sat, 20 Jul 2024 22:16:54 -0700
Subject: [PATCH] root: macro: crypto: namespace refactor into common

---
 container/src/root/macro/common/crypto.hh      | 13 +++++++++----
 container/src/root/macro/web/internal/crypto.C | 10 ++++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/container/src/root/macro/common/crypto.hh b/container/src/root/macro/common/crypto.hh
index a5dcd23..aab68da 100644
--- a/container/src/root/macro/common/crypto.hh
+++ b/container/src/root/macro/common/crypto.hh
@@ -37,8 +37,12 @@ namespace docker_finance
 //! \since docker-finance 1.0.0
 namespace macro
 {
-
-//! \namespace docker_finance::macro::crypto::botan
+//! \namespace docker_finance::macro::common
+//! \brief Shared ROOT macro-related functionality
+//! \since docker-finance 1.0.0
+namespace common
+{
+//! \namespace docker_finance::macro::common::crypto::botan
 //! \since docker-finance 1.0.0
 namespace crypto::botan
 {
@@ -51,7 +55,7 @@ auto g_Hash = std::make_unique<::docker_finance::crypto::botan::Hash>();
 auto g_Random = std::make_unique<::docker_finance::crypto::botan::Random>();
 }  // namespace crypto::botan
 
-//! \namespace docker_finance::macro::crypto::cryptopp
+//! \namespace docker_finance::macro::common::crypto::cryptopp
 //! \since docker-finance 1.0.0
 namespace crypto::cryptopp
 {
@@ -64,7 +68,7 @@ auto g_Hash = std::make_unique<::docker_finance::crypto::cryptopp::Hash>();
 auto g_Random = std::make_unique<::docker_finance::crypto::cryptopp::Random>();
 }  // namespace crypto::cryptopp
 
-//! \namespace docker_finance::macro::crypto::libsodium
+//! \namespace docker_finance::macro::common::crypto::libsodium
 //! \since docker-finance 1.0.0
 namespace crypto::libsodium
 {
@@ -77,6 +81,7 @@ auto g_Hash = std::make_unique<::docker_finance::crypto::libsodium::Hash>();
 auto g_Random = std::make_unique<::docker_finance::crypto::libsodium::Random>();
 }  // namespace crypto::libsodium
 
+}  // namespace common
 }  // namespace macro
 }  // namespace docker_finance
 
diff --git a/container/src/root/macro/web/internal/crypto.C b/container/src/root/macro/web/internal/crypto.C
index 349fe50..c7e15a1 100644
--- a/container/src/root/macro/web/internal/crypto.C
+++ b/container/src/root/macro/web/internal/crypto.C
@@ -344,20 +344,22 @@ class Random final
         });
 
     namespace common = ::docker_finance::macro::common;
+
     const std::string timestamp{common::make_timestamp()};
 
     data.title = "Botan_RNG_" + timestamp;
-    random(
-        data, []() -> uint32_t { return crypto::botan::g_Random->generate(); });
+    random(data, []() -> uint32_t {
+      return common::crypto::botan::g_Random->generate();
+    });
 
     data.title = "Crypto++_RNG_" + timestamp;
     random(data, []() -> uint32_t {
-      return crypto::cryptopp::g_Random->generate();
+      return common::crypto::cryptopp::g_Random->generate();
     });
 
     data.title = "libsodium_RNG_" + timestamp;
     random(data, []() -> uint32_t {
-      return crypto::libsodium::g_Random->generate();
+      return common::crypto::libsodium::g_Random->generate();
     });
 
     // TODO(unassigned): when clicking reload to create another sample, it doesn't do a clean refresh of the canvas