Avoid using std::format

Co-authored-by: Andrei Maiboroda <[email protected]>

Author: hugo-dc

test/unittests/eof_test.cpp

@@ -6,7 +6,6 @@
 #include <gtest/gtest.h>
 #include <test/utils/bytecode.hpp>
 #include <test/utils/utils.hpp>
-#include <format>
 
 using namespace std;
 using namespace evmone;
@@ -48,7 +47,7 @@ TEST(eof, read_valid_eof1_header)
         if (i < 255)
         {
             nops_255 += "5B";
-            code_sections_256 += "E5" + std::format("{:04X}", i + 1);
+            code_sections_256 += "E5" + hex(big_endian(static_cast<uint16_t>(i + 1)));
         }
         else
             code_sections_256 += "5B5B00";

test/unittests/eof_validation_test.cpp

@@ -7,7 +7,6 @@
 #include <gtest/gtest.h>
 #include <test/utils/bytecode.hpp>
 #include <test/utils/utils.hpp>
-#include <format>
 
 using namespace std;
 using namespace evmone;
@@ -316,7 +315,7 @@ TEST(eof_validation, EOF1_too_many_code_sections)
     std::string code_sections_1024;
     for (int i = 0; i < 1024; ++i)
         if (i < 1023)
-            code_sections_1024 += "E5" + std::format("{:04X}", i + 1);
+            code_sections_1024 += "E5" + hex(big_endian(static_cast<uint16_t>(i + 1)));
         else
             code_sections_1024 += "5B5B00";
 
@@ -867,7 +866,7 @@ TEST(eof_validation, many_code_sections_1023)
     std::string code_sections_1023;
     for (auto i = 0; i < 1023; ++i)
         if (i < 1022)
-            code_sections_1023 += "E5" + std::format("{:04X}", i + 1);
+            code_sections_1023 += "E5" + hex(big_endian(static_cast<uint16_t>(i + 1)));
         else
             code_sections_1023 += "5B5B00";
 
@@ -882,7 +881,7 @@ TEST(eof_validation, many_code_sections_1024)
     std::string code_sections_1024;
     for (auto i = 0; i < 1024; ++i)
         if (i < 1023)
-            code_sections_1024 += "E5" + std::format("{:04X}", i + 1);
+            code_sections_1024 += "E5" + hex(big_endian(static_cast<uint16_t>(i + 1)));
         else
             code_sections_1024 += "5B5B00";
 
@@ -1251,18 +1250,22 @@ TEST(eof_validation, unreachable_code_sections)
             if (i < 255)
                 if (i == 1)
                 {
-                    code_sections_256_err_001 += "E5" + std::format("{:04X}", i);
-                    code_sections_256_err_254 += "E5" + std::format("{:04X}", i + 1);
+                    code_sections_256_err_001 += "E5" + hex(big_endian(static_cast<uint16_t>(i)));
+                    code_sections_256_err_254 +=
+                        "E5" + hex(big_endian(static_cast<uint16_t>(i + 1)));
                 }
                 else if (i == 254)
                 {
-                    code_sections_256_err_001 += "E5" + std::format("{:04X}", i + 1);
-                    code_sections_256_err_254 += "E5" + std::format("{:04X}", i);
+                    code_sections_256_err_001 +=
+                        "E5" + hex(big_endian(static_cast<uint16_t>(i + 1)));
+                    code_sections_256_err_254 += "E5" + hex(big_endian(static_cast<uint16_t>(i)));
                 }
                 else
                 {
-                    code_sections_256_err_001 += "E5" + std::format("{:04X}", i + 1);
-                    code_sections_256_err_254 += "E5" + std::format("{:04X}", i + 1);
+                    code_sections_256_err_001 +=
+                        "E5" + hex(big_endian(static_cast<uint16_t>(i + 1)));
+                    code_sections_256_err_254 +=
+                        "E5" + hex(big_endian(static_cast<uint16_t>(i + 1)));
                 }
             else
             {