Remove discarded blocks and states from database by default

client/cli/src/params/pruning_params.rs

@@ -46,6 +46,7 @@ impl PruningParams {
 			.as_ref()
 			.map(|s| match s.as_str() {
 				"archive" => Ok(PruningMode::ArchiveAll),
+				"canonical" => Ok(PruningMode::ArchiveCanonical),
 				bc => bc
 					.parse()
 					.map_err(|_| error::Error::Input("Invalid pruning mode specified".to_string()))

client/state-db/src/lib.rs

@@ -260,7 +260,7 @@ impl PruningMode {
 
 impl Default for PruningMode {
 	fn default() -> Self {
-		PruningMode::Constrained(Default::default())
+		PruningMode::ArchiveCanonical
 	}
 }
 
@@ -835,12 +835,12 @@ mod tests {
 	#[test]
 	fn pruning_mode_compatibility() {
 		for (created, reopened, expected) in [
-			(None, None, Ok(PruningMode::blocks_pruning(256))),
-			(None, Some(PruningMode::blocks_pruning(256)), Ok(PruningMode::blocks_pruning(256))),
-			(None, Some(PruningMode::blocks_pruning(128)), Ok(PruningMode::blocks_pruning(128))),
-			(None, Some(PruningMode::blocks_pruning(512)), Ok(PruningMode::blocks_pruning(512))),
+			(None, None, Ok(PruningMode::ArchiveCanonical)),
+			(None, Some(PruningMode::blocks_pruning(256)), Err(())),
+			(None, Some(PruningMode::blocks_pruning(128)), Err(())),
+			(None, Some(PruningMode::blocks_pruning(512)), Err(())),
 			(None, Some(PruningMode::ArchiveAll), Err(())),
-			(None, Some(PruningMode::ArchiveCanonical), Err(())),
+			(None, Some(PruningMode::ArchiveCanonical), Ok(PruningMode::ArchiveCanonical)),
 			(Some(PruningMode::blocks_pruning(256)), None, Ok(PruningMode::blocks_pruning(256))),
 			(
 				Some(PruningMode::blocks_pruning(256)),