From cdb904287c1bd59e668574ec6ad6378a4d53412d Mon Sep 17 00:00:00 2001
From: fengzero <fengzero@fengzero.com>
Date: Thu, 31 Mar 2022 08:47:05 +0000
Subject: [PATCH] move base64.h to utils

---
 include/neuron.h                         |  2 +-
 include/{neu_base64.h => utils/base64.h} |  0
 package/create_neuron_sdk_deb.py         |  7 +++++--
 src/utils/base64.c                       | 14 ++++++--------
 tests/base64_test.cc                     |  2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)
 rename include/{neu_base64.h => utils/base64.h} (100%)

diff --git a/include/neuron.h b/include/neuron.h
index d0e5d9c6..c47838cf 100644
--- a/include/neuron.h
+++ b/include/neuron.h
@@ -24,8 +24,8 @@
 extern "C" {
 #endif
 
+#include "utils/base64.h"
 #include "neu_adapter.h"
-#include "neu_base64.h"
 #include "neu_file.h"
 #include "neu_list.h"
 #include "neu_log.h"
diff --git a/include/neu_base64.h b/include/utils/base64.h
similarity index 100%
rename from include/neu_base64.h
rename to include/utils/base64.h
diff --git a/package/create_neuron_sdk_deb.py b/package/create_neuron_sdk_deb.py
index 79236061..0d509e1d 100755
--- a/package/create_neuron_sdk_deb.py
+++ b/package/create_neuron_sdk_deb.py
@@ -51,6 +51,11 @@ rules.append(mkdeb.FileMap("../include/json/neu_json_tag.h",
 rules.append(mkdeb.FileMap("../include/json/neu_json_tty.h",
              "/usr/local/include/neuron/json/"))
 
+rules.append(mkdeb.FileMap("../include/utils/uthash.h",
+             "/usr/local/include/neuron/utils/"))
+rules.append(mkdeb.FileMap("../include/utils/base64.h",
+             "/usr/local/include/neuron/utils/"))
+
 rules.append(mkdeb.FileMap("../include/hash_table.h",
              "/usr/local/include/neuron/"))
 rules.append(mkdeb.FileMap("../include/idhash.h",
@@ -59,8 +64,6 @@ rules.append(mkdeb.FileMap("../include/neu_adapter.h",
              "/usr/local/include/neuron/"))
 rules.append(mkdeb.FileMap("../include/neu_atomic_data.h",
              "/usr/local/include/neuron/"))
-rules.append(mkdeb.FileMap("../include/neu_base64.h",
-             "/usr/local/include/neuron/"))
 rules.append(mkdeb.FileMap("../include/neu_data_expr.h",
              "/usr/local/include/neuron/"))
 rules.append(mkdeb.FileMap("../include/neu_datatag_table.h",
diff --git a/src/utils/base64.c b/src/utils/base64.c
index 5fd858c8..708f640a 100644
--- a/src/utils/base64.c
+++ b/src/utils/base64.c
@@ -17,21 +17,20 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  **/
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <openssl/evp.h>
 
-#include "neuron.h"
-
 char *neu_encode64(const unsigned char *input, int length)
 {
     const int      pl     = 4 * ((length + 2) / 3);
     unsigned char *output = calloc(pl + 1, 1);
     const int      ol     = EVP_EncodeBlock(output, input, length);
-    if (ol != pl) {
-        log_error("Encode predicted %d but we got %d\n", pl, ol);
-    }
+
+    assert(pl == ol);
 
     return (char *) output;
 }
@@ -42,9 +41,8 @@ unsigned char *neu_decode64(int *length, const char *input)
     const int      pl     = 3 * len / 4;
     unsigned char *output = calloc(pl, 1);
     const int ol = EVP_DecodeBlock(output, (const unsigned char *) input, len);
-    if (pl != ol) {
-        log_error("Decode predicted %d but we got %d\n", pl, ol);
-    }
+
+    assert(pl == ol);
 
     *length = ol;
     return output;
diff --git a/tests/base64_test.cc b/tests/base64_test.cc
index 694b5786..b78cecab 100644
--- a/tests/base64_test.cc
+++ b/tests/base64_test.cc
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "neu_base64.h"
+#include "utils/base64.h"
 
 TEST(Base64Test, neu_encode64_test)
 {