Merge branch 'master' of github.com:ethcore/parity into trace_err

parity/cli.rs

@@ -122,12 +122,13 @@ Footprint Options:
                            auto uses last used value of this option (off if it does
                            not exist) [default: auto].
   --pruning METHOD         Configure pruning of the state/storage trie. METHOD
-                           may be one of auto, archive, basic, fast, light:
+                           may be one of auto, archive, fast, basic, light:
                            archive - keep all state trie data. No pruning.
-                           basic - reference count in disk DB. Slow but light.
                            fast - maintain journal overlay. Fast but 50MB used.
-                           light - early merges with partial tracking. Fast
-                           and light. Experimental!
+                           basic - reference count in disk DB. Slow, light, and
+                           experimental!
+                           light - early merges with partial tracking. Fast,
+                           light, and experimental!
                            auto - use the method most recently synced or
                            default to archive if none synced [default: auto].
   --cache-pref-size BYTES  Specify the prefered size of the blockchain cache in

parity/configuration.rs

@@ -225,7 +225,7 @@ impl Configuration {
 			"light" => journaldb::Algorithm::EarlyMerge,
 			"fast" => journaldb::Algorithm::OverlayRecent,
 			"basic" => journaldb::Algorithm::RefCounted,
-			"auto" => self.find_best_db(spec).unwrap_or(journaldb::Algorithm::OverlayRecent),
+			"auto" => self.find_best_db(spec).unwrap_or(journaldb::Algorithm::Archive),
 			_ => { die!("Invalid pruning method given."); }
 		};