Merge pull request EOSIO#1488 from wanderingbort/feature/fixes-for-mu…

…ltinode-testing fixes for multi-node testing with the test.system contract
Vanderwald · Feb 27, 2018 · 6ce958f · 6ce958f
2 parents 49ac3da + a123272
commit 6ce958f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/contracts/test.system/test.system.abi b/contracts/test.system/test.system.abi
@@ -19,15 +19,15 @@
       "name": "producer_key",
       "base": "",
       "fields": [
-        {"name":"account",    "type":"account_name"},
-        {"name":"public_key", "type":"string"}
+        {"name":"producer_name",      "type":"account_name"},
+        {"name":"signing_key",  "type":"public_key"}
       ]
     },{
       "name": "set_producers",
       "base": "",
       "fields": [
         {"name":"version",    "type":"uint32"},
-        {"name":"producer",   "type":"producer_key[]"}
+        {"name":"producers",   "type":"producer_key[]"}
       ]
     },{
       "name": "require_auth",

diff --git a/libraries/chain/chain_controller.cpp b/libraries/chain/chain_controller.cpp
@@ -1364,7 +1364,7 @@ account_name chain_controller::get_scheduled_producer(uint32_t slot_num)const
    uint64_t current_aslot = dpo.current_absolute_slot + slot_num;
    const auto& gpo = _db.get<global_property_object>();
    auto number_of_active_producers = gpo.active_producers.producers.size();
-   auto index = current_aslot % (number_of_active_producers);
+   auto index = current_aslot % (number_of_active_producers * config::producer_repititions);
    index /= config::producer_repititions;
    FC_ASSERT( gpo.active_producers.producers.size() > 0, "no producers defined" );
 

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
@@ -2478,9 +2478,9 @@ namespace eosio {
    chain::public_key_type net_plugin_impl::get_authentication_key() const {
       if(!private_keys.empty())
          return private_keys.begin()->first;
-      producer_plugin* pp = app().find_plugin<producer_plugin>();
+      /*producer_plugin* pp = app().find_plugin<producer_plugin>();
       if(pp != nullptr && pp->get_state() == abstract_plugin::started)
-         return pp->first_producer_public_key();
+         return pp->first_producer_public_key();*/
       return chain::public_key_type();
    }