X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Fsrc%2Foffer_deser.rs;h=84b69d3fcd31f5dc82bbf1bdf60faa4036283f25;hb=f267ffe2fc0f01f4d692cac412d2f668a9db12ca;hp=e16c3b4103b4d568640ce3ff77967d02e5ca6f5b;hpb=3141630f78a0f1ec7ef374ede95a21e4e64213f5;p=rust-lightning diff --git a/fuzz/src/offer_deser.rs b/fuzz/src/offer_deser.rs index e16c3b41..84b69d3f 100644 --- a/fuzz/src/offer_deser.rs +++ b/fuzz/src/offer_deser.rs @@ -7,9 +7,9 @@ // You may not use this file except in accordance with one or both of these // licenses. -use bitcoin::secp256k1::{KeyPair, PublicKey, Secp256k1, SecretKey}; use crate::utils::test_logger; -use core::convert::{Infallible, TryFrom}; +use bitcoin::secp256k1::{Keypair, PublicKey, Secp256k1, SecretKey}; +use core::convert::TryFrom; use lightning::offers::invoice_request::UnsignedInvoiceRequest; use lightning::offers::offer::{Amount, Offer, Quantity}; use lightning::offers::parse::Bolt12SemanticError; @@ -23,15 +23,15 @@ pub fn do_test(data: &[u8], _out: Out) { assert_eq!(data, bytes); let secp_ctx = Secp256k1::new(); - let keys = KeyPair::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap()); + let keys = Keypair::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap()); let pubkey = PublicKey::from(keys); let mut buffer = Vec::new(); if let Ok(invoice_request) = build_response(&offer, pubkey) { invoice_request - .sign::<_, Infallible>( - |message| Ok(secp_ctx.sign_schnorr_no_aux_rand(message.as_ref().as_digest(), &keys)) - ) + .sign(|message: &UnsignedInvoiceRequest| { + Ok(secp_ctx.sign_schnorr_no_aux_rand(message.as_ref().as_digest(), &keys)) + }) .unwrap() .write(&mut buffer) .unwrap(); @@ -40,7 +40,7 @@ pub fn do_test(data: &[u8], _out: Out) { } fn build_response( - offer: &Offer, pubkey: PublicKey + offer: &Offer, pubkey: PublicKey, ) -> Result { let mut builder = offer.request_invoice(vec![42; 64], pubkey)?;