tester: update to latest signer, checkin cargo.lock

This commit is contained in:
decentclock
2022-10-31 13:34:03 -04:00
parent 736f4f0e8e
commit a628c388a9
5 changed files with 3192 additions and 17 deletions

2
.gitignore vendored
View File

@@ -1,7 +1,7 @@
.vscode .vscode
.embuild .embuild
target target
Cargo.lock !Cargo.lock
!sphinx-key/Cargo.lock !sphinx-key/Cargo.lock
!factory/Cargo.lock !factory/Cargo.lock
.DS_Store .DS_Store

3181
Cargo.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -1,8 +1,6 @@
[workspace] [workspace]
members = [ members = [
"parser",
"signer",
"tester", "tester",
] ]

View File

@@ -1,7 +1,7 @@
use dotenv::dotenv; use dotenv::dotenv;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use sphinx_signer::sphinx_glyph::control::{ControlMessage, Controller};
use sphinx_signer::lightning_signer::bitcoin::Network; use sphinx_signer::lightning_signer::bitcoin::Network;
use sphinx_signer::sphinx_glyph::control::{ControlMessage, Controller};
use std::env; use std::env;
use std::time::Duration; use std::time::Duration;

View File

@@ -1,21 +1,21 @@
use sphinx_signer::sphinx_glyph::topics;
use sphinx_signer::parser;
use sphinx_signer::lightning_signer::bitcoin::Network; use sphinx_signer::lightning_signer::bitcoin::Network;
use sphinx_signer::lightning_signer::persist::Persist; use sphinx_signer::lightning_signer::persist::Persist;
use sphinx_signer::parser;
use sphinx_signer::persist::FsPersister; use sphinx_signer::persist::FsPersister;
use sphinx_signer::sphinx_glyph::{topics, types};
use clap::{App, AppSettings, Arg}; use clap::{App, AppSettings, Arg};
use dotenv::dotenv; use dotenv::dotenv;
use rumqttc::{self, AsyncClient, Event, EventLoop, MqttOptions, Packet, QoS}; use rumqttc::{self, AsyncClient, Event, EventLoop, MqttOptions, Packet, QoS};
use sphinx_signer::sphinx_glyph::control::Controller; use sphinx_signer::sphinx_glyph::control::Controller;
use sphinx_signer::vls_protocol::{model::PubKey, msgs}; use sphinx_signer::vls_protocol::{model::PubKey, msgs};
use sphinx_signer::{self, InitResponse}; use sphinx_signer::{self};
use std::convert::TryInto; use std::convert::TryInto;
use std::env; use std::env;
use std::error::Error; use std::error::Error;
use std::str::FromStr; use std::str::FromStr;
use std::time::Duration;
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration;
pub const ROOT_STORE: &str = "teststore"; pub const ROOT_STORE: &str = "teststore";
@@ -100,14 +100,10 @@ async fn run_main(
let store_path = env::var("STORE_PATH").unwrap_or(ROOT_STORE.to_string()); let store_path = env::var("STORE_PATH").unwrap_or(ROOT_STORE.to_string());
let seed32: [u8; 32] = seed.try_into().expect("wrong seed"); let seed32: [u8; 32] = seed.try_into().expect("wrong seed");
let init_msg =
sphinx_signer::make_init_msg(network, seed32).expect("failed to make init msg");
let persister: Arc<dyn Persist> = Arc::new(FsPersister::new(&store_path, None)); let persister: Arc<dyn Persist> = Arc::new(FsPersister::new(&store_path, None));
let InitResponse { let policy = types::Policy::default();
root_handler, let root_handler = sphinx_signer::root::init(seed32, network, &policy, persister)
init_reply: _, .expect("Could not initialize root_handler");
} = sphinx_signer::init(init_msg, network, &Default::default(), persister)
.expect("failed to init signer");
// the actual handler loop // the actual handler loop
loop { loop {
match eventloop.poll().await { match eventloop.poll().await {
@@ -116,7 +112,7 @@ async fn run_main(
if let Some((topic, msg_bytes)) = incoming_bytes(event) { if let Some((topic, msg_bytes)) = incoming_bytes(event) {
match topic.as_str() { match topic.as_str() {
topics::VLS => { topics::VLS => {
match sphinx_signer::handle( match sphinx_signer::root::handle(
&root_handler, &root_handler,
msg_bytes, msg_bytes,
dummy_peer.clone(), dummy_peer.clone(),