Merge pull request #175 from orogvany/prepare_new_testnet

Concensus: update max testnet validator check for testnet reboot
semuxproject · Jul 2, 2019 · 5442ee2 · 5442ee2
2 parents ceb6bac + 379fdd0
commit 5442ee2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/src/main/java/org/semux/config/TestnetConfig.java b/src/main/java/org/semux/config/TestnetConfig.java
@@ -37,20 +37,14 @@ public Map<Fork, Long> forkActivationCheckpoints() {
     }
 
     /**
-     * Testnet maxes out at 15 validators to stop dead validators from breaking
+     * Testnet maxes out at 10 validators to stop dead validators from breaking
      * concensus
      * 
      * @param number
      * @return
      */
     @Override
     public int getNumberOfValidators(long number) {
-
-        // adjust number down to unstick testnet to more reasonable max
-        if (number <= 751638) {
-            return super.getNumberOfValidators(number);
-        } else {
-            return 15;
-        }
+        return Math.min(10, super.getNumberOfValidators(number));
     }
 }
diff --git a/src/main/java/org/semux/consensus/SemuxSync.java b/src/main/java/org/semux/consensus/SemuxSync.java
@@ -539,16 +539,6 @@ protected boolean validateBlock(Block block, AccountState asSnapshot, DelegateSt
         BlockHeader header = block.getHeader();
         List<Transaction> transactions = block.getTransactions();
 
-        // a workaround to ensure testnet clients ignore bad block, can remove at later
-        // date
-        if (config.network() == Network.TESTNET) {
-            String badBlock = "0x1a472841464b9bea9e530d73a95e1213f29adef11a3661f3e98df87a9a230b7d";
-            String blockHash = Hex.encode0x(block.getHash());
-            if (badBlock.equals(blockHash)) {
-                return false;
-            }
-        }
-
         // [1] check block header
         Block latest = chain.getLatestBlock();
         if (!block.validateHeader(latest.getHeader(), header)) {