diff --git a/.gitignore b/.gitignore index d600d54..e57113e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ Cargo.lock notes.md test-flash .env -teststore \ No newline at end of file +teststore +teststore2 \ No newline at end of file diff --git a/parser/Cargo.toml b/parser/Cargo.toml index 1b9706d..002c019 100644 --- a/parser/Cargo.toml +++ b/parser/Cargo.toml @@ -9,7 +9,7 @@ serde = { version = "1.0", default-features = false } rmp-serde = "1.1.0" serde_bolt = { version = "0.2", default-features = false } sphinx-auther = "0.1.12" -sphinx-glyph = "0.1.0" +sphinx-glyph = "0.1.1" anyhow = "1" [features] diff --git a/tester/src/main.rs b/tester/src/main.rs index e9edc4a..4991f09 100644 --- a/tester/src/main.rs +++ b/tester/src/main.rs @@ -49,8 +49,12 @@ async fn main() -> Result<(), Box> { } else { "sphinx-1" }; + let broker: String = env::var("BROKER").unwrap_or("localhost:1883".to_string()); + let broker_: Vec<&str> = broker.split(":").collect(); + let broker_port = broker_[1].parse::().expect("NaN"); let (client, eventloop) = loop { - let mut mqttoptions = MqttOptions::new(client_id, "localhost", 1883); + println!("connect to {}:{}", broker_[0], broker_port); + let mut mqttoptions = MqttOptions::new(client_id, broker_[0], broker_port); mqttoptions.set_credentials(pubkey.clone(), token.clone()); mqttoptions.set_keep_alive(Duration::from_secs(5)); let (client, mut eventloop) = AsyncClient::new(mqttoptions, 10); @@ -87,13 +91,16 @@ async fn main() -> Result<(), Box> { } async fn run_main(mut eventloop: EventLoop, client: &AsyncClient, mut ctrlr: Controller, is_log: bool, seed: &[u8], network: Network) { + + let store_path = env::var("STORE_PATH").unwrap_or(ROOT_STORE.to_string()); + let seed32: [u8; 32] = seed.try_into().expect("wrong seed"); let init_msg = sphinx_key_signer::make_init_msg(network, seed32).expect("failed to make init msg"); let InitResponse { root_handler, init_reply: _, - } = sphinx_key_signer::init(init_msg, network, &Default::default(), ROOT_STORE) + } = sphinx_key_signer::init(init_msg, network, &Default::default(), &store_path) .expect("failed to init signer"); // the actual handler loop loop {