fix milestones signatures are not validated on testnet (since config … (

#1035)

* fix milestones signatures are not validated on testnet (since config rework)

* fix typo in existing test

src/main/java/com/iota/iri/conf/TestnetConfig.java

@@ -9,7 +9,7 @@
 public class TestnetConfig extends BaseIotaConfig {
 
     protected String coordinator = Defaults.COORDINATOR_ADDRESS;
-    protected boolean dontValidateTestnetMilestoneSig = Defaults.VALIDATE_MILESTONE_SIG;
+    protected boolean dontValidateTestnetMilestoneSig = Defaults.DONT_VALIDATE_MILESTONE_SIG;
     protected String snapshotFile = Defaults.SNAPSHOT_FILE;
     protected String snapshotSignatureFile = Defaults.SNAPSHOT_SIG;
     protected long snapshotTime = Defaults.SNAPSHOT_TIME;
@@ -160,7 +160,7 @@ public void setDbLogPath(String dbLogPath) {
 
     public interface Defaults {
         String COORDINATOR_ADDRESS = "EQQFCZBIHRHWPXKMTOLMYUYPCN9XLMJPYZVFJSAY9FQHCCLWTOLLUGKKMXYFDBOOYFBLBI9WUEILGECYM";
-        boolean VALIDATE_MILESTONE_SIG = true;
+        boolean DONT_VALIDATE_MILESTONE_SIG = false;
         String SNAPSHOT_FILE = "/snapshotTestnet.txt";
         int REQUEST_HASH_SIZE = 49;
         String SNAPSHOT_SIG = "/snapshotTestnet.sig";

src/test/java/com/iota/iri/conf/ConfigTest.java

@@ -142,7 +142,7 @@ public void testArgsParsingTestnet() {
                 //we ignore this on mainnet
                 "--mwm", "4",
                 "--testnet-coordinator", "TTTTTTTTT",
-                "--test-no-coo-validation",
+                "--testnet-no-coo-validation",
                 //this should be ignored everywhere
                 "--fake-config"
         };
@@ -173,7 +173,8 @@ public void testArgsParsingTestnet() {
         Assert.assertEquals("zmq enabled", true, iotaConfig.isZmqEnabled());
         Assert.assertEquals("mwm", 4, iotaConfig.getMwm());
         Assert.assertEquals("coo", "TTTTTTTTT", iotaConfig.getCoordinator());
-        Assert.assertEquals("--test-no-coo-validation", true, iotaConfig.isDontValidateTestnetMilestoneSig());
+        Assert.assertEquals("--testnet-no-coo-validation", true,
+                iotaConfig.isDontValidateTestnetMilestoneSig());
     }
 
     @Test
@@ -278,6 +279,13 @@ public void backwardsIniCompatibilityTest() {
                         Assert.assertThat(configNames, IsCollectionContaining.hasItem(config)));
     }
 
+    @Test
+    public void testDontValidateMIlestoneSigDefaultValue() {
+        IotaConfig iotaConfig = ConfigFactory.createIotaConfig(true);
+        Assert.assertFalse("By default testnet should be validating milestones",
+                iotaConfig.isDontValidateTestnetMilestoneSig());
+    }
+
     private String deriveNameFromSetter(Method setter) {
         JsonIgnore jsonIgnore = setter.getAnnotation(JsonIgnore.class);
         if (jsonIgnore != null) {