Encrypted Slatepack Metadata (#428)

* addition of slatepack metadata * finish adding tests ensuring forwards compatibility * fix to version check * updates based on review feedback
mimblewimble · Jun 10, 2020 · fe28809 · fe28809
1 parent 2a2367f
commit fe28809
Show file tree

Hide file tree

Showing 4 changed files with 373 additions and 21 deletions.
diff --git a/controller/tests/slatepack.rs b/controller/tests/slatepack.rs
@@ -536,7 +536,7 @@ fn slatepack_exchange_armored() {
 	let test_dir = "test_output/slatepack_exchange_armored";
 	setup(test_dir);
 	// Bin output
-	if let Err(e) = slatepack_exchange_test_impl(test_dir, true, true, false) {
+	if let Err(e) = slatepack_exchange_test_impl(test_dir, true, true, true) {
 		panic!("Libwallet Error: {} - {}", e, e.backtrace().unwrap());
 	}
 	clean_output_dir(test_dir);

diff --git a/libwallet/Cargo.toml b/libwallet/Cargo.toml
@@ -26,7 +26,6 @@ strum = "0.15"
 strum_macros = "0.15"
 ed25519-dalek = "1.0.0-pre.1"
 x25519-dalek = "0.6"
-byteorder = "1"
 base64 = "0.9"
 regex = "1.3"
 sha2 = "0.8"
@@ -35,9 +34,8 @@ age = "0.4"
 curve25519-dalek = "2.0.0"
 secrecy = "0.6"
 bech32 = "0.7"
+byteorder = "1.3"
 
 grin_wallet_util = { path = "../util", version = "4.0.0-beta.1" }
 grin_wallet_config = { path = "../config", version = "4.0.0-beta.1" }
 
-[dev-dependencies]
-byteorder = "1.3"
diff --git a/libwallet/src/slatepack/address.rs b/libwallet/src/slatepack/address.rs
@@ -29,7 +29,7 @@ use std::convert::TryFrom;
 use std::fmt::{self, Display};
 
 /// Definition of a Slatepack address
-#[derive(Debug, Clone, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct SlatepackAddress {
 	/// Human-readable prefix
 	pub hrp: String,