From f96280a2226f17bb20893bb947aae711c09425d6 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Mon, 20 Feb 2023 12:19:26 -0800 Subject: [PATCH] update deps --- Cargo.lock | 18 +++++++++--------- tester/src/main.rs | 19 ++++++------------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e607112..6331031 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -293,7 +293,7 @@ dependencies = [ [[package]] name = "bolt-derive" version = "0.1.0" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git#9112828c14ecff3bc86bd5e23a1016210de16e85" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=500fe01f#500fe01f81f2badcf59649b2eb37cc2bb3db7e28" dependencies = [ "proc-macro2", "quote", @@ -2281,7 +2281,7 @@ dependencies = [ [[package]] name = "sphinx-auther" version = "0.1.12" -source = "git+https://github.com/stakwork/sphinx-rs.git#fb621dce1ef8bf8ca8bc7dbfbafdbd6a4fb8d293" +source = "git+https://github.com/stakwork/sphinx-rs.git#58d6ac1ea03915c79d881447a8cbad7e4bab83fa" dependencies = [ "anyhow", "base64", @@ -2293,7 +2293,7 @@ dependencies = [ [[package]] name = "sphinx-crypter" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git#fb621dce1ef8bf8ca8bc7dbfbafdbd6a4fb8d293" +source = "git+https://github.com/stakwork/sphinx-rs.git#58d6ac1ea03915c79d881447a8cbad7e4bab83fa" dependencies = [ "anyhow", "chacha20poly1305", @@ -2304,7 +2304,7 @@ dependencies = [ [[package]] name = "sphinx-glyph" version = "0.1.2" -source = "git+https://github.com/stakwork/sphinx-rs.git#fb621dce1ef8bf8ca8bc7dbfbafdbd6a4fb8d293" +source = "git+https://github.com/stakwork/sphinx-rs.git#58d6ac1ea03915c79d881447a8cbad7e4bab83fa" dependencies = [ "anyhow", "hex", @@ -2343,7 +2343,7 @@ dependencies = [ [[package]] name = "sphinx-signer" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git#fb621dce1ef8bf8ca8bc7dbfbafdbd6a4fb8d293" +source = "git+https://github.com/stakwork/sphinx-rs.git#58d6ac1ea03915c79d881447a8cbad7e4bab83fa" dependencies = [ "anyhow", "bip39", @@ -2810,7 +2810,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vls-core" version = "0.1.0-5" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git#9112828c14ecff3bc86bd5e23a1016210de16e85" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=500fe01f#500fe01f81f2badcf59649b2eb37cc2bb3db7e28" dependencies = [ "anyhow", "bitcoin", @@ -2831,7 +2831,7 @@ dependencies = [ [[package]] name = "vls-persist" version = "0.1.0" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git#9112828c14ecff3bc86bd5e23a1016210de16e85" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=500fe01f#500fe01f81f2badcf59649b2eb37cc2bb3db7e28" dependencies = [ "hex", "log", @@ -2844,7 +2844,7 @@ dependencies = [ [[package]] name = "vls-protocol" version = "0.1.0" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git#9112828c14ecff3bc86bd5e23a1016210de16e85" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=500fe01f#500fe01f81f2badcf59649b2eb37cc2bb3db7e28" dependencies = [ "as-any", "bolt-derive", @@ -2858,7 +2858,7 @@ dependencies = [ [[package]] name = "vls-protocol-signer" version = "0.1.0" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git#9112828c14ecff3bc86bd5e23a1016210de16e85" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=500fe01f#500fe01f81f2badcf59649b2eb37cc2bb3db7e28" dependencies = [ "bit-vec", "log", diff --git a/tester/src/main.rs b/tester/src/main.rs index b703d17..5af024d 100644 --- a/tester/src/main.rs +++ b/tester/src/main.rs @@ -8,7 +8,7 @@ use clap::{App, AppSettings, Arg}; use dotenv::dotenv; use rumqttc::{self, AsyncClient, Event, EventLoop, MqttOptions, Packet, QoS}; use sphinx_signer::sphinx_glyph::control::Controller; -use sphinx_signer::vls_protocol::{model::PubKey, msgs}; +use sphinx_signer::vls_protocol::msgs; use sphinx_signer::{self}; use std::convert::TryInto; use std::env; @@ -109,17 +109,11 @@ async fn run_main( match eventloop.poll().await { Ok(event) => { println!("{:?}", event); - let dummy_peer = PubKey([0; 33]); if let Some((topic, msg_bytes)) = incoming_bytes(event) { println!("MSG BYTES {:}", msg_bytes.len()); match topic.as_str() { topics::VLS => { - match sphinx_signer::root::handle( - &root_handler, - msg_bytes, - dummy_peer.clone(), - is_log, - ) { + match sphinx_signer::root::handle(&root_handler, msg_bytes, is_log) { Ok(b) => client .publish(topics::VLS_RETURN, QoS::AtMostOnce, false, b) .await @@ -180,18 +174,17 @@ async fn run_test( if let Some((topic, msg_bytes)) = incoming_bytes(event) { match topic.as_str() { topics::VLS => { - let (ping, sequence, dbid): (msgs::Ping, u16, u64) = - parser::request_from_bytes(msg_bytes).expect("read ping header"); + let (ping, header) = + parser::request_from_bytes::(msg_bytes) + .expect("read ping header"); if is_log { - println!("sequence {}", sequence); - println!("dbid {}", dbid); println!("INCOMING: {:?}", ping); } let pong = msgs::Pong { id: ping.id, message: ping.message, }; - let bytes = parser::raw_response_from_msg(pong, sequence) + let bytes = parser::raw_response_from_msg(pong, header.sequence) .expect("couldnt parse raw response"); client .publish(topics::VLS_RETURN, QoS::AtMostOnce, false, bytes)