Merge pull request #283 from crytic/change_default_to_include_delay

Default time/block number delays to max of one week

Author: agroce

examples/solidity/basic/default.yaml

@@ -34,7 +34,7 @@ quiet: False
 #dashboard determines if output is just text or an AFL-like display
 dashboard: true
 #seed not defined by default, is the random seed
-maxTimeDelay: 0
-#maximum time between generated txs
-maxBlockDelay: 0
-#maximum number of blocks elapsed between generated txs
+maxTimeDelay: 604800
+#maximum time between generated txs; default is one week
+maxBlockDelay: 60480
+#maximum number of blocks elapsed between generated txs; default is expected increment in one week

lib/Echidna/Config.hs

@@ -67,7 +67,7 @@ instance FromJSON EConfig where
                                   (const psender)
         getWord s d = C Dull . fromIntegral <$> v .:? s .!= (d :: Integer)
         xc = liftM4 TxConf (getWord "propMaxGas" 8000030) (getWord "testMaxGas" 0xffffffff)
-                           (getWord "maxTimeDelay" 0)     (getWord "maxBlockDelay" 0)
+                           (getWord "maxTimeDelay" 604800)     (getWord "maxBlockDelay" 60480)
         cc = CampaignConf <$> v .:? "testLimit"   .!= 50000
                           <*> v .:? "seqLen"      .!= 100
                           <*> v .:? "shrinkLimit" .!= 5000