grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove the dapps system (#9017)

Browse Source 
* Remove the dapps system from Parity

* Move node-health outside of dapps

* Fix set dapps list test

* Update Cargo.lock

* Deprecate options

* Add _legacy_ prefixes in Dapps

* Fix tests

* Fix deprecatedness of dapps-path
This commit is contained in:
Pierre Krieger
2018-07-11 12:19:54 +02:00
committed by Afri Schoedon
parent fe678dcd2f
commit 494eb4ab6b
79 changed files with 165 additions and 6105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
util/dir/src/lib.rs
View File

@@ -61,8 +61,6 @@ pub struct Directories {
pub keys: String,
/// Signer dir
pub signer: String,
/// Dir to store dapps
pub dapps: String,
/// Secrets dir
pub secretstore: String,
}
@@ -77,7 +75,6 @@ impl Default for Directories {
cache: replace_home_and_local(&data_dir, &local_dir, CACHE_PATH),
keys: replace_home(&data_dir, "$BASE/keys"),
signer: replace_home(&data_dir, "$BASE/signer"),
dapps: replace_home(&data_dir, "$BASE/dapps"),
secretstore: replace_home(&data_dir, "$BASE/secretstore"),
}
}
@@ -85,7 +82,7 @@ impl Default for Directories {
impl Directories {
/// Create local directories
pub fn create_dirs(&self, dapps_enabled: bool, signer_enabled: bool, secretstore_enabled: bool) -> Result<(), String> {
pub fn create_dirs(&self, signer_enabled: bool, secretstore_enabled: bool) -> Result<(), String> {
fs::create_dir_all(&self.base).map_err(|e| e.to_string())?;
fs::create_dir_all(&self.db).map_err(|e| e.to_string())?;
fs::create_dir_all(&self.cache).map_err(|e| e.to_string())?;
@@ -93,9 +90,6 @@ impl Directories {
if signer_enabled {
fs::create_dir_all(&self.signer).map_err(|e| e.to_string())?;
}
if dapps_enabled {
fs::create_dir_all(&self.dapps).map_err(|e| e.to_string())?;
}
if secretstore_enabled {
fs::create_dir_all(&self.secretstore).map_err(|e| e.to_string())?;
}
@@ -356,7 +350,6 @@ mod tests {
),
keys: replace_home(&data_dir, "$BASE/keys"),
signer: replace_home(&data_dir, "$BASE/signer"),
dapps: replace_home(&data_dir, "$BASE/dapps"),
secretstore: replace_home(&data_dir, "$BASE/secretstore"),
};
assert_eq!(expected, Directories::default());