Merge pull request #212 from jl777/dev

Test
jl777 · Feb 25, 2017 · 359a7b1 · 359a7b1
2 parents b05aac8 + eaba9a2
commit 359a7b1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -670,7 +670,7 @@ void static BitcoinMiner(CWallet *pwallet)
             } else Mining_start = 0;
             while (true)
             {
-                if ( ASSETCHAINS_SYMBOL[0] != 0 && pblock->vtx[0].vout.size() == 1 && Mining_height > ASSETCHAINS_MINHEIGHT )
+                if ( 0 && ASSETCHAINS_SYMBOL[0] != 0 && pblock->vtx[0].vout.size() == 1 && Mining_height > ASSETCHAINS_MINHEIGHT ) // skips when it shouldnt
                 {
                     fprintf(stderr,"skip generating %s on-demand block, no tx avail\n",ASSETCHAINS_SYMBOL);
                     sleep(10);

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2386,7 +2386,7 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int
             }
             if ( nTotalLower > 2*nTargetValue + CENT )
             {
-                fprintf(stderr,"why bother with all the utxo if we have double what is needed?\n");
+                //fprintf(stderr,"why bother with all the utxo if we have double what is needed?\n");
                 break;
             }
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 if ( nTotalLower > 2*nTargetValue + CENT )
                 {
-                    fprintf(stderr,"why bother with all the utxo if we have double what is needed?\n");
+                    //fprintf(stderr,"why bother with all the utxo if we have double what is needed?\n");
                     break;
                 }
             }
@@ Expand Down @@