Cleanup HTTP APIs, update ports to avoid gap, rustfmt

Moved the HTTP APIs away from the REST endpoint abstraction and
to simpler Hyper handlers. Re-established all routes as v1.
Changed wallet receiver port to 13415 to avoid a gap in port
numbers.

Finally, rustfmt seems to have ignored specific files arguments,
running on everything.

keychain/src/extkey.rs

@@ -17,7 +17,7 @@ use std::cmp::min;
 
 use serde::{de, ser};
 
-use byteorder::{ByteOrder, BigEndian};
+use byteorder::{BigEndian, ByteOrder};
 use blake2::blake2b::blake2b;
 use util::secp;
 use util::secp::Secp256k1;
@@ -253,11 +253,11 @@ impl ExtendedKey {
 
 		let derived = blake2b(64, &self.chaincode[..], &seed[..]);
 
-		let mut secret_key = SecretKey::from_slice(&secp, &derived.as_bytes()[0..32])
+		let mut secret_key =
+			SecretKey::from_slice(&secp, &derived.as_bytes()[0..32]).expect("Error deriving key");
+		secret_key
+			.add_assign(secp, &self.key)
 			.expect("Error deriving key");
-		secret_key.add_assign(secp, &self.key).expect(
-			"Error deriving key",
-		);
 		// TODO check if key != 0 ?
 
 		let mut chain_code: [u8; 32] = [0; 32];
@@ -312,13 +312,10 @@ mod test {
 		let s = Secp256k1::new();
 		let seed = from_hex("000102030405060708090a0b0c0d0e0f");
 		let extk = ExtendedKey::from_seed(&s, &seed.as_slice()).unwrap();
-		let sec = from_hex(
-			"c3f5ae520f474b390a637de4669c84d0ed9bbc21742577fac930834d3c3083dd",
-		);
+		let sec = from_hex("c3f5ae520f474b390a637de4669c84d0ed9bbc21742577fac930834d3c3083dd");
 		let secret_key = SecretKey::from_slice(&s, sec.as_slice()).unwrap();
-		let chaincode = from_hex(
-			"e7298e68452b0c6d54837670896e1aee76b118075150d90d4ee416ece106ae72",
-		);
+		let chaincode =
+			from_hex("e7298e68452b0c6d54837670896e1aee76b118075150d90d4ee416ece106ae72");
 		let identifier = from_hex("83e59c48297b78b34b73");
 		let depth = 0;
 		let n_child = 0;
@@ -343,13 +340,10 @@ mod test {
 		let seed = from_hex("000102030405060708090a0b0c0d0e0f");
 		let extk = ExtendedKey::from_seed(&s, &seed.as_slice()).unwrap();
 		let derived = extk.derive(&s, 0).unwrap();
-		let sec = from_hex(
-			"d75f70beb2bd3b56f9b064087934bdedee98e4b5aae6280c58b4eff38847888f",
-		);
+		let sec = from_hex("d75f70beb2bd3b56f9b064087934bdedee98e4b5aae6280c58b4eff38847888f");
 		let secret_key = SecretKey::from_slice(&s, sec.as_slice()).unwrap();
-		let chaincode = from_hex(
-			"243cb881e1549e714db31d23af45540b13ad07941f64a786bbf3313b4de1df52",
-		);
+		let chaincode =
+			from_hex("243cb881e1549e714db31d23af45540b13ad07941f64a786bbf3313b4de1df52");
 		let root_key_id = from_hex("83e59c48297b78b34b73");
 		let identifier = from_hex("0185adb4d8b730099c93");
 		let depth = 1;

keychain/src/keychain.rs

@@ -20,7 +20,7 @@ use util::secp::{Message, Secp256k1, Signature};
 use util::secp::key::SecretKey;
 use util::secp::pedersen::{Commitment, ProofMessage, ProofInfo, RangeProof};
 use blake2;
-use blind::{BlindingFactor, BlindSum};
+use blind::{BlindSum, BlindingFactor};
 use extkey::{self, Identifier};
 
 
@@ -56,7 +56,7 @@ impl Keychain {
 	}
 
 	// For tests and burn only, associate a key identifier with a known secret key.
-	//
+ //
 	pub fn burn_enabled(keychain: &Keychain, burn_key_id: &Identifier) -> Keychain {
 		let mut key_overrides = HashMap::new();
 		key_overrides.insert(
@@ -210,7 +210,7 @@ mod test {
 		let msg = secp::Message::from_slice(&msg_bytes[..]).unwrap();
 
 		// now create a zero commitment using the key on the keychain associated with
-		// the key_id
+  // the key_id
 		let commit = keychain.commit(0, &key_id).unwrap();
 
 		// now check we can use our key to verify a signature from this zero commitment
@@ -232,7 +232,7 @@ mod test {
 		assert_eq!(proof_info.value, 5);
 
 		// now check the recovered message is "empty" (but not truncated) i.e. all
-		// zeroes
+  // zeroes
 		assert_eq!(
 			proof_info.message,
 			secp::pedersen::ProofMessage::from_bytes(&[0; secp::constants::PROOF_MSG_SIZE])

keychain/src/lib.rs

@@ -16,10 +16,10 @@
 
 extern crate blake2_rfc as blake2;
 extern crate byteorder;
+extern crate grin_util as util;
 extern crate rand;
 extern crate grin_util as util;
 extern crate serde;
-#[macro_use]
 extern crate serde_derive;
 extern crate serde_json;
 
@@ -27,6 +27,6 @@ mod blind;
 mod extkey;
 
 pub use blind::{BlindSum, BlindingFactor};
-pub use extkey::{Identifier, ExtendedKey, IDENTIFIER_SIZE};
+pub use extkey::{ExtendedKey, Identifier, IDENTIFIER_SIZE};
 pub mod keychain;
 pub use keychain::{Error, Keychain};