GH-54 Remove mostly unused CORE_SYM_STR and just use CORE_SYMBOL

AntelopeIO · Jan 3, 2023 · 6c17992 · 6c17992
1 parent 4dc4296
commit 6c17992
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 25 deletions.
diff --git a/libraries/testing/contracts.hpp.in b/libraries/testing/contracts.hpp.in
@@ -1,24 +1,7 @@
 #pragma once
 
-#include <vector>
-
-#include <eosio/chain/asset.hpp>
 #include <fc/io/fstream.hpp>
-
-#define CORE_SYM_NAME "${CORE_SYMBOL_NAME}"
-#define CORE_SYM_PRECISION 4
-
-#define _STRINGIZE1(x) #x
-#define _STRINGIZE2(x) _STRINGIZE1(x)
-
-#define CORE_SYM_STR ( _STRINGIZE2(CORE_SYM_PRECISION) "," CORE_SYM_NAME )
-#define CORE_SYM  ( ::eosio::chain::string_to_symbol_c( CORE_SYM_PRECISION, CORE_SYM_NAME ) )
-
-struct core_sym {
-   static inline eosio::chain::asset from_string(const std::string& s) {
-      return eosio::chain::asset::from_string(s + " " CORE_SYM_NAME);
-   }
-};
+#include <vector>
 
 // CN -> contract C++ name, C -> contract name, D -> top level directory
 #define MAKE_READ_WASM_ABI(CN,C, D)                                                         \

diff --git a/plugins/chain_plugin/test/test_chain_plugin.cpp b/plugins/chain_plugin/test/test_chain_plugin.cpp
@@ -11,11 +11,8 @@
 #include <eosio/chain/resource_limits.hpp>
 #include <eosio/chain/wast_to_wasm.hpp>
 #include <cstdlib>
-#include <iostream>
-#include <sstream>
 #include <fc/log/logger.hpp>
 #include <eosio/chain/exceptions.hpp>
-#include <Runtime/Runtime.h>
 
 #ifdef NON_VALIDATING_TEST
 #define TESTER tester
@@ -221,7 +218,7 @@ class chain_plugin_tester : public TESTER {
        base_tester::push_action(config::system_account_name, "init"_n,
                                 config::system_account_name,  mutable_variant_object()
                                         ("version", 0)
-                                        ("core", CORE_SYM_STR));
+                                        ("core", symbol(CORE_SYMBOL).to_string()));
 
        {
            const auto& accnt = control->db().get<account_object,by_name>( config::system_account_name );

diff --git a/unittests/bootseq_tests.cpp b/unittests/bootseq_tests.cpp
@@ -72,7 +72,7 @@ class bootseq_tester : public TESTER {
          base_tester::push_action(config::system_account_name, "init"_n,
                                   config::system_account_name,  mutable_variant_object()
                                   ("version", 0)
-                                  ("core", CORE_SYM_STR)
+                                  ("core", symbol(CORE_SYMBOL).to_string())
             );
       }
       const auto& accnt = control->db().get<account_object,by_name>( config::system_account_name );

diff --git a/unittests/eosio_system_tester.hpp b/unittests/eosio_system_tester.hpp
@@ -60,7 +60,7 @@ class eosio_system_tester : public TESTER {
       base_tester::push_action(config::system_account_name, "init"_n,
                             config::system_account_name,  mutable_variant_object()
                             ("version", 0)
-                            ("core", CORE_SYM_STR));
+                            ("core", symbol(CORE_SYMBOL).to_string()));
 
       {
          const auto& accnt = control->db().get<account_object,by_name>( config::system_account_name );

diff --git a/unittests/state_history_tests.cpp b/unittests/state_history_tests.cpp
@@ -376,7 +376,7 @@ BOOST_AUTO_TEST_CASE(test_deltas_resources_history) {
    chain.push_action(config::system_account_name, "init"_n, config::system_account_name,
                         mutable_variant_object()
                         ("version", 0)
-                        ("core", CORE_SYM_STR));
+                        ("core", symbol(CORE_SYMBOL).to_string()));
 
    signed_transaction trx;
    chain.set_transaction_headers(trx);