- removed devPool support, due no devPool type online anymore

README.md

@@ -15,7 +15,6 @@ This file has to be in the miner directory (same folder as '*.jar' file)
 > The min. required settings for the different mining-modes.
 
 # Pool-Setup
-uses only the best deadline per block to calculate shares.
 
     plotPaths=D:/,C:/,E:/plots,F:/plots
     numericAccountId=<YOUR NUMERIC ACCOUNT ID>
@@ -26,20 +25,6 @@ uses only the best deadline per block to calculate shares.
     plotPaths=D:/,C:/,E:/plots,F:/plots
     poolMining=false
     passPhrase=<YOUR PASS PHRASE>
-
-# DevPool-Setup 
-uses all deadlines below a given target per block to calculate shares.
-DevPool http://178.62.39.204:8121 seams no longer available?! 
-Miner support will be removed in future versions.
-
-    devPool=true
-    plotPaths=D:/,C:/,E:/plots,F:/plots
-    numericAccountId=<YOUR NUMERIC ACCOUNT ID>
-    poolServer=http://pool.com:port
-
-
-
-
 
 
 # List of all properties
@@ -112,28 +97,6 @@ time to wait until next retry to get winner from walletServer
 
     winnerRetryIntervalInMs=250
 
-### devPool (default:false)
-'true' for using devPools (V1 or V2), 'false' or empty if not
-on using devPool please read NOTICE in description of 'chunkPartNonces'
-DevPool http://178.62.39.204:8121 seams no longer available?! 
-Miner support will be removed in future versions.
-
-    devPool=true
-
-### devPoolCommitsPerRound (default:3)
-how often the miner tries to commit shares to devPool not needed for other pools.
-DevPool http://178.62.39.204:8121 seams no longer available?! 
-Miner support will be removed in future versions.
-
-    devPoolCommitsPerRound=6
-
-
->    NOTICE: 'devPool' wants all deadlines below a given target, this miner will only deliver
->            one deadline per chunkPart, so it can happen, that not all shares can be delivered
->            i suggest using lower 'chunkPartNonces' e.g. 160000 ... (1 result per 160000 nonces)
->            play with that on same block to test if you get more shares with lower 'chunkPartNonces'.
-
-
 
 ## Solo-mining
 
@@ -260,12 +223,6 @@ e.g. play with +/- 160000 steps
 
     chunkPartNonces=960000 
 
-
->    NOTICE: for 'devPool': only one result per chunkPart will be committed,
->            without 'optDevPool' (witch is not implemented, yet)
->            consider using low chunkPartNonces size, to commit more.
->            (guess, there will not be multiple dl below target in small chunkPart)
-
 ### readerThreads (default:0)
 normally '0' means, the miner takes one thread per drive (plotPath) this is recommend.
 choosing a other number of 'readerThreads' can be useful on memory issues.

jminer.default.properties

@@ -73,17 +73,6 @@ poolMining=
 # (default:4)
 # winnerRetryIntervalInMs - time to wait until next retry to get winner from walletServer
 # (default:500)
-#
-# devPool                 - 'true' for using devPools (V1 or V2), 'false' or empty if not
-# (default:false)           on using devPool please read NOTICE in description of 'chunkPartNonces'
-#
-# devPoolCommitsPerRound  - how often the miner tries to commit shares to devPool
-# (default:3)               not needed for other pools.
-#
-# NOTICE: 'devPool' wants all deadlines below a given target, this miner will only deliver
-#         one deadline per chunkPart, so it can happen, that not all shares can be delivered
-#         i suggest using lower 'chunkPartNonces' e.g. 160000 ... (1 result per 160000 nonces)
-#         play with that on same block to test if you get more shares with lower 'chunkPartNonces'.
 # -----------------------------------------------------------------------------------
 numericAccountId=xxxxxxxxxxxxxxx
 poolServer=http://pool.com
@@ -93,10 +82,6 @@ walletServer=https://wallet.burst-team.us
 winnerRetriesOnAsync=
 winnerRetryIntervalInMs=
 
-# devPool (DevPool http://178.62.39.204:8121 seams no longer available?! Miner support will be removed in future versions.)
-devPool=
-devPoolCommitsPerRound=
-
 # -----------------------------------------------------------------------------------
 # - MINING MODE - SOLO ---------------------------------- ONLY NEEDED 4 SOLO MINING -
 # -----------------------------------------------------------------------------------
@@ -193,16 +178,10 @@ showSkippedDeadlines=
 #                   if staggersize is smaller than chunkPartNonces, staggersize will be used.
 #                   e.g. play with +/- 160000 steps
 #
-#                   NOTICE: for 'devPool': only one result per chunkPart will be committed,
-#                           without 'optDevPool' (witch is not implemented, yet)
-#                           consider using low chunkPartNonces size, to commit more.
-#                           (guess, there will not be multiple dl below target in small chunkPart)
-#
 # readerThreads   - normally '0' means, the miner takes one thread per drive (plotPath) this is recommend.
 # (default:0)       choosing a other number of 'readerThreads' can be useful on memory issues.
 #                   For example, if you mine on 4 drives (plotPaths), you can reduce the memory usage
 #                   by setting 'readerThreads=2', this will reduce mining speed but save memory.
 # -----------------------------------------------------------------------------------
 chunkPartNonces=
-readerThreads=
-
+readerThreads=

src/main/java/burstcoin/jminer/JMinerCommandLine.java

@@ -24,13 +24,11 @@
 
 import burstcoin.jminer.core.CoreProperties;
 import burstcoin.jminer.core.network.Network;
-import burstcoin.jminer.core.network.event.NetworkDevResultConfirmedEvent;
 import burstcoin.jminer.core.network.event.NetworkLastWinnerEvent;
 import burstcoin.jminer.core.network.event.NetworkPoolInfoEvent;
 import burstcoin.jminer.core.network.event.NetworkResultConfirmedEvent;
 import burstcoin.jminer.core.network.event.NetworkResultErrorEvent;
 import burstcoin.jminer.core.network.event.NetworkStateChangeEvent;
-import burstcoin.jminer.core.network.model.DevPoolResult;
 import burstcoin.jminer.core.reader.event.ReaderCorruptFileEvent;
 import burstcoin.jminer.core.reader.event.ReaderDriveFinishEvent;
 import burstcoin.jminer.core.reader.event.ReaderDriveInterruptedEvent;
@@ -260,20 +258,6 @@ public void onApplicationEvent(NetworkResultConfirmedEvent event)
       }
     });
 
-    context.addApplicationListener(new ApplicationListener<NetworkDevResultConfirmedEvent>()
-    {
-      @Override
-      public void onApplicationEvent(NetworkDevResultConfirmedEvent event)
-      {
-        LOG.info("devPool response '" + event.getResponse() + "', block '" + event.getBlockNumber() + "'");
-        for(DevPoolResult devPoolResult : event.getDevPoolResults())
-        {
-          LOG.info(
-            "dl '" + devPoolResult.getCalculatedDeadline() + "' successful committed!  [ " + getDeadlineTime(devPoolResult.getCalculatedDeadline()) + " ]");
-        }
-      }
-    });
-
     context.addApplicationListener(new ApplicationListener<NetworkResultErrorEvent>()
     {
       @Override

src/main/java/burstcoin/jminer/core/CoreConfig.java

@@ -40,11 +40,6 @@
 @ComponentScan(basePackages = "burstcoin.jminer.core")
 public class CoreConfig
 {
-  /**
-   * Reader pool.
-   *
-   * @return the thread pool task executor
-   */
   @Bean(name = "readerPool")
   public ThreadPoolTaskExecutor readerPool()
   {
@@ -55,11 +50,6 @@ public ThreadPoolTaskExecutor readerPool()
     return pool;
   }
 
-  /**
-   * Network pool.
-   *
-   * @return the thread pool task executor
-   */
   @Bean(name = "networkPool")
   public SimpleAsyncTaskExecutor networkPool()
   {
@@ -68,33 +58,18 @@ public SimpleAsyncTaskExecutor networkPool()
     return pool;
   }
 
-  /**
-   * Task executor.
-   *
-   * @return the sync task executor
-   */
   @Bean(name = "checkTaskExecutor")
   public SyncTaskExecutor taskExecutor()
   {
     return new SyncTaskExecutor();
   }
 
-  /**
-   * Round pool.
-   *
-   * @return the thread pool task executor
-   */
   @Bean(name = "roundPool")
   public ThreadPoolTaskExecutor roundPool()
   {
     return new ThreadPoolTaskExecutor();
   }
 
-  /**
-   * Http client.
-   *
-   * @return the http client
-   */
   @Bean
   public HttpClient httpClient()
   {
@@ -110,11 +85,6 @@ public HttpClient httpClient()
     return client;
   }
 
-  /**
-   * Object mapper.
-   *
-   * @return the object mapper
-   */
   @Bean
   public ObjectMapper objectMapper()
   {

src/main/java/burstcoin/jminer/core/CoreProperties.java

@@ -33,10 +33,6 @@
 import java.util.List;
 import java.util.Properties;
 
-
-/**
- * The type Core properties.
- */
 public class CoreProperties
 {
   private static final Logger LOG = LoggerFactory.getLogger(CoreProperties.class);
@@ -48,7 +44,6 @@ public class CoreProperties
   private static final int DEFAULT_PLATFORM_ID = 0;
   private static final int DEFAULT_DEVICE_ID = 0;
   private static final boolean DEFAULT_POOL_MINING = true;
-  private static final boolean DEFAULT_DEV_POOL = false;
   private static final long DEFAULT_TARGET_DEADLINE = Long.MAX_VALUE;
   private static final String DEFAULT_SOLO_SERVER = "http://localhost:8125";
   private static final int DEFAULT_READ_PROGRESS_PER_ROUND = 9;
@@ -57,7 +52,6 @@ public class CoreProperties
   private static final int DEFAULT_WINNER_RETRIES_ON_ASYNC = 4;
   private static final int DEFAULT_WINNER_RETRY_INTERVAL_IN_MS = 500;
   private static final boolean DEFAULT_SCAN_PATHS_EVERY_ROUND = true;
-  private static final int DEFAULT_DEV_POOL_COMMITS_PER_ROUND = 3;
   private static final boolean DEFAULT_BYTE_UNIT_DECIMAL = true;
   private static final boolean DEFAULT_LIST_PLOT_FILES = false;
   private static final boolean DEFAULT_SHOW_DRIVE_INFO = false;
@@ -86,8 +80,6 @@ public class CoreProperties
   private static Integer winnerRetriesOnAsync;
   private static Long winnerRetryIntervalInMs;
   private static Boolean scanPathsEveryRound;
-  private static Integer devPoolCommitsPerRound;
-  private static Boolean devPool;
   private static Boolean poolMining;
   private static Long targetDeadline;
   private static List<String> plotPaths;
@@ -198,34 +190,6 @@ public static boolean isScanPathsEveryRound()
     return scanPathsEveryRound;
   }
 
-  /**
-   * Gets dev pool commits per round.
-   *
-   * @return the dev pool commits per round
-   */
-  public static int getDevPoolCommitsPerRound()
-  {
-    if(devPoolCommitsPerRound == null)
-    {
-      devPoolCommitsPerRound = asInteger("devPoolCommitsPerRound", DEFAULT_DEV_POOL_COMMITS_PER_ROUND);
-    }
-    return devPoolCommitsPerRound;
-  }
-
-  /**
-   * Is dev pool.
-   *
-   * @return the boolean
-   */
-  public static boolean isDevPool()
-  {
-    if(devPool == null)
-    {
-      devPool = asBoolean("devPool", DEFAULT_DEV_POOL);
-    }
-    return devPool;
-  }
-
   /**
    * Is pool mining.
    *

src/main/java/burstcoin/jminer/core/checker/Checker.java

@@ -39,7 +39,6 @@
 @Component
 @Scope("singleton")
 public class Checker
-  implements ReaderLoadedPartEvent.Handler
 {
   private static final Logger LOG = LoggerFactory.getLogger(Checker.class);
 
@@ -63,7 +62,6 @@ public void reconfigure(long blockNumber, byte[] generationSignature)
     this.generationSignature = generationSignature;
   }
 
-  @Override
   @EventListener
   public void handleMessage(ReaderLoadedPartEvent event)
   {

src/main/java/burstcoin/jminer/core/checker/task/OCLCheckerTask.java

@@ -26,8 +26,6 @@
 import burstcoin.jminer.core.checker.event.CheckerResultEvent;
 import burstcoin.jminer.core.checker.util.OCLChecker;
 import fr.cryptohash.Shabal256;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Scope;
@@ -41,8 +39,6 @@
 public class OCLCheckerTask
   implements Runnable
 {
-  private static final Logger LOG = LoggerFactory.getLogger(OCLCheckerTask.class);
-
   private final ApplicationEventPublisher publisher;
   private final OCLChecker oclChecker;