Merge branch 'testmaster' into beta

2018-04-16 03:29:05 +03:00
parent 80d1414870 6107175727
commit a5f848c45a
10 changed files with 23 additions and 34 deletions
--- a/src/rpcblockchain.cpp
+++ b/src/rpcblockchain.cpp
@@ -732,7 +732,7 @@ UniValue minerids(const UniValue& params, bool fHelp)
        if ( pblockindex != 0 )
            timestamp = pblockindex->GetBlockTime();
    }
-    if ( 0 && (n= komodo_minerids(minerids,height,(int32_t)(sizeof(minerids)/sizeof(*minerids)))) > 0 )
+    if ( (n= komodo_minerids(minerids,height,(int32_t)(sizeof(minerids)/sizeof(*minerids)))) > 0 )
    {
        memset(tally,0,sizeof(tally));
        numnotaries = komodo_notaries(pubkeys,height,timestamp);