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

Revert the rescuedao extradata.

Browse Source
This commit is contained in:
Gav Wood 2016-06-25 14:35:43 +02:00 committed by arkpar
parent 879bee994d
commit 8a644e7185
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
parity/configuration.rs
View File

@ -130,14 +130,10 @@ impl Configuration {
} }
pub fn extra_data(&self) -> Bytes { pub fn extra_data(&self) -> Bytes {
if !self.args.flag_dont_help_rescue_dao { match self.args.flag_extradata.as_ref().or(self.args.flag_extra_data.as_ref()) {
(b"rescuedao"[..]).to_owned() Some(ref x) if x.len() <= 32 => x.as_bytes().to_owned(),
} else { None => version_data(),
match self.args.flag_extradata.as_ref().or(self.args.flag_extra_data.as_ref()) { Some(ref x) => { die!("{}: Extra data must be at most 32 characters.", x); }
Some(ref x) if x.len() <= 32 => x.as_bytes().to_owned(),
None => version_data(),
Some(ref x) => { die!("{}: Extra data must be at most 32 characters.", x); }
}
} }
} }