From ad2f63d898f3631713a5630fbfb7965f385bd0a0 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 15 Sep 2023 17:11:16 -0700 Subject: [PATCH] bump --- broker/Cargo.lock | 10 +++++----- broker/Cargo.toml | 4 ++-- broker/src/mqtt.rs | 14 +++----------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/broker/Cargo.lock b/broker/Cargo.lock index 8d03638..f9e217b 100644 --- a/broker/Cargo.lock +++ b/broker/Cargo.lock @@ -1691,7 +1691,7 @@ dependencies = [ [[package]] name = "lss-connector" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs?rev=b4b0f78f24e91cb632ef3d99a3304435c9dd3540#b4b0f78f24e91cb632ef3d99a3304435c9dd3540" +source = "git+https://github.com/stakwork/sphinx-rs?rev=66d7032705918146552473dc27ef1bcfae45aa4b#66d7032705918146552473dc27ef1bcfae45aa4b" dependencies = [ "anyhow", "lightning-storage-server", @@ -2693,7 +2693,7 @@ dependencies = [ [[package]] name = "rmp-utils" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs?rev=b4b0f78f24e91cb632ef3d99a3304435c9dd3540#b4b0f78f24e91cb632ef3d99a3304435c9dd3540" +source = "git+https://github.com/stakwork/sphinx-rs?rev=66d7032705918146552473dc27ef1bcfae45aa4b#66d7032705918146552473dc27ef1bcfae45aa4b" dependencies = [ "anyhow", "log", @@ -3268,7 +3268,7 @@ dependencies = [ [[package]] name = "sphinx-auther" version = "0.1.12" -source = "git+https://github.com/stakwork/sphinx-rs?rev=b4b0f78f24e91cb632ef3d99a3304435c9dd3540#b4b0f78f24e91cb632ef3d99a3304435c9dd3540" +source = "git+https://github.com/stakwork/sphinx-rs?rev=66d7032705918146552473dc27ef1bcfae45aa4b#66d7032705918146552473dc27ef1bcfae45aa4b" dependencies = [ "anyhow", "base64 0.21.2", @@ -3280,7 +3280,7 @@ dependencies = [ [[package]] name = "sphinx-glyph" version = "0.1.2" -source = "git+https://github.com/stakwork/sphinx-rs?rev=b4b0f78f24e91cb632ef3d99a3304435c9dd3540#b4b0f78f24e91cb632ef3d99a3304435c9dd3540" +source = "git+https://github.com/stakwork/sphinx-rs?rev=66d7032705918146552473dc27ef1bcfae45aa4b#66d7032705918146552473dc27ef1bcfae45aa4b" dependencies = [ "anyhow", "hex", @@ -3326,7 +3326,7 @@ dependencies = [ [[package]] name = "sphinx-signer" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs?rev=b4b0f78f24e91cb632ef3d99a3304435c9dd3540#b4b0f78f24e91cb632ef3d99a3304435c9dd3540" +source = "git+https://github.com/stakwork/sphinx-rs?rev=66d7032705918146552473dc27ef1bcfae45aa4b#66d7032705918146552473dc27ef1bcfae45aa4b" dependencies = [ "anyhow", "bip39", diff --git a/broker/Cargo.toml b/broker/Cargo.toml index a7e0f38..cec2aa2 100644 --- a/broker/Cargo.toml +++ b/broker/Cargo.toml @@ -39,8 +39,8 @@ vls-proxy = { git = "https://gitlab.com/lightning-signer/validating-li # vls-protocol-client = { path = "../../vls/vls-protocol-client" } # vls-proxy = { path = "../../vls/vls-proxy" } -lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "b4b0f78f24e91cb632ef3d99a3304435c9dd3540" } -sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "b4b0f78f24e91cb632ef3d99a3304435c9dd3540" } +lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "66d7032705918146552473dc27ef1bcfae45aa4b" } +sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "66d7032705918146552473dc27ef1bcfae45aa4b" } # lss-connector = { path = "../../sphinx-rs/lss-connector" } # sphinx-signer = { path = "../../sphinx-rs/signer" } diff --git a/broker/src/mqtt.rs b/broker/src/mqtt.rs index d0caa4a..9127213 100644 --- a/broker/src/mqtt.rs +++ b/broker/src/mqtt.rs @@ -266,17 +266,9 @@ fn pub_timeout( } fn subs(cid: &str, mut ltx: LinkTx) { - ltx.subscribe(format!("{}/{}", cid, topics::VLS_RES)) - .unwrap(); - ltx.subscribe(format!("{}/{}", cid, topics::CONTROL_RES)) - .unwrap(); - ltx.subscribe(format!("{}/{}", cid, topics::ERROR)).unwrap(); - ltx.subscribe(format!("{}/{}", cid, topics::LSS_RES)) - .unwrap(); - ltx.subscribe(format!("{}/{}", cid, topics::INIT_1_RES)) - .unwrap(); - ltx.subscribe(format!("{}/{}", cid, topics::INIT_2_RES)) - .unwrap(); + for t in topics::BROKER_SUBS { + ltx.subscribe(format!("{}/{}", cid, t)).unwrap(); + } } fn unsubs(_cid: &str, mut _ltx: LinkTx) {