rework decode_slatepack function to accept decryption key indices (#445)

This commit is contained in:
Yeastplume
2020-06-15 14:39:52 +01:00
committed by GitHub
parent d9c6bd89e2
commit 040b28f35a
5 changed files with 72 additions and 16 deletions
+4 -3
View File
@@ -626,7 +626,8 @@ where
|api, m| {
slate =
api.slate_from_slatepack_message(m, message.clone(), vec![0])?;
let slatepack = api.decode_slatepack_message(message, true)?;
let slatepack =
api.decode_slatepack_message(m, message.clone(), vec![0])?;
ret_address = slatepack.sender;
Ok(())
},
@@ -735,8 +736,8 @@ where
None => match args.input_slatepack_message {
Some(mes) => {
let mut sp = Slatepack::default();
controller::owner_single_use(None, keychain_mask, Some(owner_api), |api, _| {
sp = api.decode_slatepack_message(mes, false)?;
controller::owner_single_use(None, keychain_mask, Some(owner_api), |api, m| {
sp = api.decode_slatepack_message(m, mes, vec![])?;
Ok(())
})?;
sp
+1 -1
View File
@@ -496,7 +496,7 @@ fn slatepack_api_impl(test_dir: &'static str) -> Result<(), libwallet::Error> {
let enc_addr = api.get_slatepack_address(m, 0)?;
let slatepack = api.create_slatepack_message(m, &slate, Some(0), vec![enc_addr])?;
println!("{}", slatepack);
let slatepack_raw = api.decode_slatepack_message(slatepack.clone(), true)?;
let slatepack_raw = api.decode_slatepack_message(m, slatepack.clone(), vec![0])?;
println!("{}", slatepack_raw);
let decoded_slate = api.slate_from_slatepack_message(m, slatepack, vec![0])?;
println!("{}", decoded_slate);