From 2574d000a3950d4038b6d18c1f7fa17d919c6f7e Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Sat, 25 Jun 2016 14:35:43 +0200 Subject: [PATCH] Revert the rescuedao extradata. --- parity/configuration.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/parity/configuration.rs b/parity/configuration.rs index d92e50a41..012e41a53 100644 --- a/parity/configuration.rs +++ b/parity/configuration.rs @@ -130,14 +130,10 @@ impl Configuration { } pub fn extra_data(&self) -> Bytes { - if !self.args.flag_dont_help_rescue_dao { - (b"rescuedao"[..]).to_owned() - } else { - match self.args.flag_extradata.as_ref().or(self.args.flag_extra_data.as_ref()) { - 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); } - } + match self.args.flag_extradata.as_ref().or(self.args.flag_extra_data.as_ref()) { + 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); } } }