From 9cbc78e30d08c6c03d804127791886ae6fa9c289 Mon Sep 17 00:00:00 2001 From: Gijs Van Laer Date: Thu, 5 Dec 2019 15:57:59 -0500 Subject: [PATCH] Change address length --- src/lib.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index be80110..c384dde 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -520,7 +520,7 @@ pub mod wtp_utils { const BLS12_381_G1_LEN: usize = 48; const BLS12_381_G2_LEN: usize = 96; const SECP256K1_PK_LEN: usize = 33; - const ADDRESS_LEN: usize = 32; + const ADDRESS_LEN: usize = 33; pub fn reconstruct_secp_public_key(pk_bytes: &[u8; SECP256K1_PK_LEN]) -> secp256k1::PublicKey { return secp256k1::PublicKey::from_slice(pk_bytes).unwrap(); @@ -668,7 +668,7 @@ pub mod wtp_utils { return secp.verify(&msg, &sig, &pubkey).is_ok() } - pub fn reconstruct_secp_channel_close_m(address: &[u8; 32], ser_revoke_token: &Vec, ser_sig: &Vec) -> ChannelcloseM { + pub fn reconstruct_secp_channel_close_m(address: &[u8; ADDRESS_LEN], ser_revoke_token: &Vec, ser_sig: &Vec) -> ChannelcloseM { let revoke_token = secp256k1::Signature::from_der(&ser_revoke_token.as_slice()).unwrap(); let sig = secp256k1::Signature::from_der(&ser_sig.as_slice()).unwrap(); ChannelcloseM { @@ -1147,15 +1147,15 @@ mod tests { #[test] fn test_reconstruct_channel_close_m() { - let mut address = [0u8; 32]; - let address_slice = hex::decode("1111111111111111111111111111111111111111111111111111111111111111").unwrap(); + let mut address = [0u8; 33]; + let address_slice = hex::decode("0a1111111111111111111111111111111111111111111111111111111111111111").unwrap(); address.copy_from_slice(address_slice.as_slice()); let channelClose = wtp_utils::reconstruct_secp_channel_close_m(&address, &hex::decode("3044022041932b376fe2c5e9e9ad0a3804e2290c3bc40617ea4f7b913be858dbcc3760b50220429d6eb1aabbd4135db4e0776c0b768af844b0af44f2f8f9da5a65e8541b4e9f").unwrap(), &hex::decode("3045022100e76653c5f8cb4c2f39efc7c5450d4f68ef3d84d482305534f5dfc310095a3124022003c4651ce1305cffe5e483ab99925cc4c9c5df2b5449bb18a51d52b21d789716").unwrap()); - assert_eq!(channelClose.address, "1111111111111111111111111111111111111111111111111111111111111111"); + assert_eq!(channelClose.address, "0a1111111111111111111111111111111111111111111111111111111111111111"); assert_eq!(format!("{:?}", channelClose.revoke.unwrap()), "3044022041932b376fe2c5e9e9ad0a3804e2290c3bc40617ea4f7b913be858dbcc3760b50220429d6eb1aabbd4135db4e0776c0b768af844b0af44f2f8f9da5a65e8541b4e9f"); assert_eq!(format!("{:?}", channelClose.signature), "3045022100e76653c5f8cb4c2f39efc7c5450d4f68ef3d84d482305534f5dfc310095a3124022003c4651ce1305cffe5e483ab99925cc4c9c5df2b5449bb18a51d52b21d789716"); }