corrected previous PR

EOSIO · Feb 4, 2022 · f808948 · f808948
1 parent a86d80c
commit f808948
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/libraries/rodeos/include/b1/rodeos/constants.hpp b/libraries/rodeos/include/b1/rodeos/constants.hpp
@@ -4,9 +4,6 @@
 
 namespace b1::rodeos {
 
-// Used as db parameter to kv_table, not used for anything anymore
-inline constexpr eosio::name state_database{ "eosio.state" };
-
 // account which stores nodeos state
 inline constexpr eosio::name state_account{ "eosio.state" };
 

diff --git a/libraries/rodeos/include/b1/rodeos/rodeos_tables.hpp b/libraries/rodeos/include/b1/rodeos/rodeos_tables.hpp
@@ -79,7 +79,7 @@ struct block_info_kv : eosio::kv_table<block_info> {
                                       } };
 
    block_info_kv(eosio::kv_environment environment) : eosio::kv_table<block_info>{ std::move(environment) } {
-      init(state_account, state_database, primary_index, id_index);
+      init(state_account, eosio::name{ "block.info" }, primary_index, id_index);
    }
 };
 
@@ -88,7 +88,7 @@ struct global_property_kv : eosio::kv_table<global_property> {
                                            [](const auto& var) { return std::vector<char>{}; } };
 
    global_property_kv(eosio::kv_environment environment) : eosio::kv_table<global_property>{ std::move(environment) } {
-      init(state_account, state_database, primary_index);
+      init(state_account, eosio::name{ "global.prop" }, primary_index);
    }
 };
 
@@ -98,7 +98,7 @@ struct account_kv : eosio::kv_table<account> {
                                     } };
 
    account_kv(eosio::kv_environment environment) : eosio::kv_table<account>{ std::move(environment) } {
-      init(state_account, state_database, primary_index);
+      init(state_account, eosio::name{ "account" }, primary_index);
    }
 };
 
@@ -109,7 +109,7 @@ struct account_metadata_kv : eosio::kv_table<account_metadata> {
 
    account_metadata_kv(eosio::kv_environment environment)
        : eosio::kv_table<account_metadata>{ std::move(environment) } {
-      init(state_account, state_database, primary_index);
+      init(state_account, eosio::name{ "account.meta" }, primary_index);
    }
 };
 
@@ -122,7 +122,7 @@ struct code_kv : eosio::kv_table<code> {
    };
 
    code_kv(eosio::kv_environment environment) : eosio::kv_table<code>{ std::move(environment) } {
-      init(state_account, state_database, primary_index);
+      init(state_account, eosio::name{ "code" }, primary_index);
    }
 };
 
@@ -135,7 +135,7 @@ struct contract_table_kv : eosio::kv_table<contract_table> {
    };
 
    contract_table_kv(eosio::kv_environment environment) : eosio::kv_table<contract_table>{ std::move(environment) } {
-      init(state_account, state_database, primary_index);
+      init(state_account, eosio::name{ "contract.tab" }, primary_index);
    }
 };
 
@@ -150,7 +150,7 @@ struct contract_row_kv : eosio::kv_table<contract_row> {
                            } };
 
    contract_row_kv(eosio::kv_environment environment) : eosio::kv_table<contract_row>{ std::move(environment) } {
-      init(state_account, state_database, primary_index);
+      init(state_account, eosio::name{ "contract.row" }, primary_index);
    }
 };
 
@@ -176,7 +176,7 @@ struct contract_index64_kv : eosio::kv_table<contract_index64> {
 
    contract_index64_kv(eosio::kv_environment environment)
        : eosio::kv_table<contract_index64>{ std::move(environment) } {
-      init(state_account, state_database, primary_index, secondary_index);
+      init(state_account, eosio::name{ "contract.i1" }, primary_index, secondary_index);
    }
 };
 
@@ -202,7 +202,7 @@ struct contract_index128_kv : eosio::kv_table<contract_index128> {
 
    contract_index128_kv(eosio::kv_environment environment)
        : eosio::kv_table<contract_index128>{ std::move(environment) } {
-      init(state_account, state_database, primary_index, secondary_index);
+      init(state_account, eosio::name{ "contract.i2" }, primary_index, secondary_index);
    }
 };