Merge pull request EOSIO#157 from enumivo/staging

Staging
bithacks-tech · May 28, 2018 · 9009e0e · 9009e0e
2 parents a2c1190 + 01ec6e0
commit 9009e0e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
@@ -750,8 +750,10 @@ struct controller_impl {
       try {
          auto onbtrx = std::make_shared<transaction_metadata>( get_on_block_transaction() );
          push_transaction( onbtrx, fc::time_point::maximum(), true, self.get_global_properties().configuration.min_transaction_cpu_usage );
+      } catch ( const fc::exception& e ) {
+         edump((e.to_detail_string()));
       } catch ( ... ) {
-         ilog( "on block transaction failed, but shouldn't impact block generation, system contract needs update" );
+         wlog( "on block transaction failed, but shouldn't impact block generation, system contract needs update" );
       }
 
       clear_expired_input_transactions();

diff --git a/tests/testUtils.py b/tests/testUtils.py
@@ -1370,7 +1370,7 @@ def launch(self, pnodes=1, totalNodes=1, prodCount=1, topo="mesh", delay=1, only
         if len(self.nodes) > 0:
             raise RuntimeError("Cluster already running.")
 
-        cmd="%s -p %s -n %s -s %s -d %s -f" % (
+        cmd="%s -p %s -n %s -s %s -d %s -f --p2p-plugin bnet" % (
             Utils.EnuLauncherPath, pnodes, totalNodes, topo, delay)
         cmdArr=cmd.split()
         if self.staging: