Merge pull request openethereum#12 from thefallentree/clique-goerli

Fix up bad code merge

ethcore/src/engines/clique/mod.rs

@@ -242,6 +242,12 @@ impl Engine<EthereumMachine> for Clique {
         }).collect::<Vec<AncestryAction>>().to_vec()
     }
 
+	fn executive_author (&self, header: &Header) -> Address {
+		public_to_address(
+			&recover(header).unwrap()
+		)
+	}
+
   fn verify_block_basic(&self, _header: &Header) -> Result<(), Error> { 
       /*
     if _header.number() == 0 {
@@ -338,15 +344,6 @@ impl Engine<EthereumMachine> for Clique {
 	//self.validators.register_client(client);
   }
 
-  fn extra_info(&self, header: &Header) -> BTreeMap<String, String> {
-      trace!(target: "engine", "extra info");
-      let mut movie_reviews = BTreeMap::<String, String>::new();
-
-      // review some movies.
-      movie_reviews.insert(String::from("Office Space"),       String::from("Deals with real issues in the workplace."));
-      movie_reviews
-  }
-
   fn verify_local_seal(&self, header: &Header) -> Result<(), Error> { Ok(()) }
 
   fn fork_choice(&self, new: &ExtendedHeader, current: &ExtendedHeader) -> super::ForkChoice {

parity/params.rs

@@ -91,7 +91,6 @@ impl fmt::Display for SpecType {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		f.write_str(match *self {
 			SpecType::Foundation => "foundation",
-			SpecType::Rinkeby => "rinkeby",
 			SpecType::Classic => "classic",
 			SpecType::Poanet => "poanet",
 			SpecType::Tobalaba => "tobalaba",