bugfix_sate

core/common/CMakeLists.txt

@@ -1,27 +1,12 @@
-add_library(cache_map STATIC
-  cache_map.cpp)
 add_library(datetime STATIC datetime.cpp)
-add_library(logger STATIC logger.cpp)
 
-target_link_libraries(logger
-    datetime
-    spdlog
-)
 
 add_library(random STATIC random.cpp)
 
 add_library(exception STATIC
     exception.cpp
 )
 
-add_library(expected STATIC
-  expected.cpp
-)
-target_link_libraries(expected
-    exception
-    flatbuffers
-)
-
 add_library(timer STATIC timer.cpp)
 
 add_library(ip_tools STATIC ip_tools.cpp)

core/common/ip_tools.cpp

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include <utils/ip_tools.hpp>
-#include <utils/logger.hpp>
+#include <common/ip_tools.hpp>
+#include <logger/logger.hpp>
 
 #include <iostream>
 #include <regex>
@@ -86,7 +86,7 @@ std::pair<uint32_t, uint32_t> getIpRangeByNetmask(const std::string &netmask) {
 
   uint32_t cidrmask = (uint32_t)std::stoul(dividedIp[1]);
   if (cidrmask < 16) {
-    logger::warning("Networks larger than /16 are not supported for now");
+    logger::Logger("ip_tools").warning("Networks larger than /16 are not supported for now");
     return result;
   }
 

core/common/random.cpp

@@ -4,7 +4,7 @@ namespace random_service {
 
 std::string makeHashByMT19937() {
   static std::mt19937 mt(std::random_device{}());
-  return hash::sha3_256_hex(std::to_string(mt()));
+  return crypto::hash::sha3_256_hex(std::to_string(mt()));
 }
 
 };  // namespace random_service