user defaults are network-dependent

parity/blockchain.rs

@@ -114,15 +114,18 @@ fn execute_import(cmd: ImportBlockchain) -> Result<String, String> {
 	// create dirs used by parity
 	try!(cmd.dirs.create_dirs());
 
+	// load spec file
+	let spec = try!(cmd.spec.spec());
+
+	// user defaults path
+	let user_defaults_path = cmd.dirs.user_defaults_path(&spec.fork_name);
+
 	// load user defaults
-	let mut user_defaults = try!(UserDefaults::load(cmd.dirs.user_defaults_path()));
+	let mut user_defaults = try!(UserDefaults::load(&user_defaults_path));
 
 	// check if tracing is on
 	let tracing = try!(tracing_switch_to_bool(cmd.tracing, &user_defaults));
 
-	// load spec file
-	let spec = try!(cmd.spec.spec());
-
 	// load genesis hash
 	let genesis_hash = spec.genesis_header().hash();
 
@@ -226,7 +229,7 @@ fn execute_import(cmd: ImportBlockchain) -> Result<String, String> {
 	// save user defaults
 	user_defaults.pruning = algorithm;
 	user_defaults.tracing = tracing;
-	try!(user_defaults.save(cmd.dirs.user_defaults_path()));
+	try!(user_defaults.save(&user_defaults_path));
 
 	Ok("Import completed.".into())
 }
@@ -238,17 +241,20 @@ fn execute_export(cmd: ExportBlockchain) -> Result<String, String> {
 	// create dirs used by parity
 	try!(cmd.dirs.create_dirs());
 
+	// load spec file
+	let spec = try!(cmd.spec.spec());
+
+	// user defaults path
+	let user_defaults_path = cmd.dirs.user_defaults_path(&spec.fork_name);
+
 	// load user defaults
-	let user_defaults = try!(UserDefaults::load(cmd.dirs.user_defaults_path()));
+	let user_defaults = try!(UserDefaults::load(&user_defaults_path));
 
 	// check if tracing is on
 	let tracing = try!(tracing_switch_to_bool(cmd.tracing, &user_defaults));
 
 	let format = cmd.format.unwrap_or_else(Default::default);
 
-	// load spec file
-	let spec = try!(cmd.spec.spec());
-
 	// load genesis hash
 	let genesis_hash = spec.genesis_header().hash();
 

parity/dir.rs

@@ -75,9 +75,12 @@ impl Directories {
 	}
 
 	/// Get user defaults path
-	pub fn user_defaults_path(&self) -> PathBuf {
+	pub fn user_defaults_path(&self, fork_name: &Option<String>) -> PathBuf {
 		let mut dir = Path::new(&self.db).to_path_buf();
-		dir.push("user_defaults");
+		match *fork_name {
+			Some(ref name) => dir.push(format!("user_defaults_{}", name)),
+			None => dir.push("user_defaults"),
+		}
 		dir
 	}
 }

parity/run.rs

@@ -90,17 +90,21 @@ pub fn execute(cmd: RunCmd) -> Result<(), String> {
 	// create dirs used by parity
 	try!(cmd.dirs.create_dirs());
 
+	// load spec
+	let spec = try!(cmd.spec.spec());
+
+	// user defaults path
+	let user_defaults_path = cmd.dirs.user_defaults_path(&spec.fork_name);
+
 	// load user defaults
-	let mut user_defaults = try!(UserDefaults::load(cmd.dirs.user_defaults_path()));
+	let mut user_defaults = try!(UserDefaults::load(&user_defaults_path));
 
 	// check if tracing is on
 	let tracing = try!(tracing_switch_to_bool(cmd.tracing, &user_defaults));
 
 	// set up logger
 	let logger = try!(setup_log(&cmd.logger_config));
 
-	// load spec
-	let spec = try!(cmd.spec.spec());
 	let fork_name = spec.fork_name.clone();
 
 	// load genesis hash
@@ -264,7 +268,7 @@ pub fn execute(cmd: RunCmd) -> Result<(), String> {
 	// save user defaults
 	user_defaults.pruning = algorithm;
 	user_defaults.tracing = tracing;
-	try!(user_defaults.save(cmd.dirs.user_defaults_path()));
+	try!(user_defaults.save(&user_defaults_path));
 
 	// Handle exit
 	wait_for_exit(panic_handler, http_server, ipc_server, dapps_server, signer_server);

parity/snapshot.rs

@@ -69,15 +69,18 @@ impl SnapshotCommand {
 		// Setup panic handler
 		let panic_handler = PanicHandler::new_in_arc();
 
+		// load spec file
+		let spec = try!(self.spec.spec());
+
+		// user defaults path
+		let user_defaults_path = self.dirs.user_defaults_path(&spec.fork_name);
+
 		// load user defaults
-		let user_defaults = try!(UserDefaults::load(self.dirs.user_defaults_path()));
+		let user_defaults = try!(UserDefaults::load(&user_defaults_path));
 
 		// check if tracing is on
 		let tracing = try!(tracing_switch_to_bool(self.tracing, &user_defaults));
 
-		// load spec file
-		let spec = try!(self.spec.spec());
-
 		// load genesis hash
 		let genesis_hash = spec.genesis_header().hash();