diff --git a/README.md b/README.md index 8980077..2e79537 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Before building the sphinx-key esp software, run this: Find the path to your `riscv32-esp-elf-gcc` binary within the `.embuild` dir: -`export CC=$PWD/.embuild/espressif/tools/riscv32-esp-elf/esp-2021r2-8.4.0/riscv32-esp-elf/bin/riscv32-esp-elf-gcc` +`export CC=$PWD/.embuild/espressif/tools/riscv32-esp-elf/esp-2021r2-patch3-8.4.0/riscv32-esp-elf/bin/riscv32-esp-elf-gcc` ### build test diff --git a/persister/src/persist_fs.rs b/persister/src/persist_fs.rs index f25b95e..13d0aea 100644 --- a/persister/src/persist_fs.rs +++ b/persister/src/persist_fs.rs @@ -1,19 +1,15 @@ use fsdb::{Bucket, DoubleBucket, Fsdb}; -use lightning_signer::persist::Persist; -use lightning_signer_server::persist::model::{ChannelEntry, NodeEntry}; -use std::string::String; - use lightning_signer::bitcoin::secp256k1::PublicKey; use lightning_signer::chain::tracker::ChainTracker; -use lightning_signer::channel::Channel; -use lightning_signer::channel::ChannelId; -use lightning_signer::channel::ChannelStub; +use lightning_signer::channel::{Channel, ChannelId, ChannelStub}; use lightning_signer::monitor::ChainMonitor; use lightning_signer::node::NodeConfig; +use lightning_signer::persist::Persist; use lightning_signer::policy::validator::EnforcementState; -use lightning_signer_server::persist::model::AllowlistItemEntry; -use lightning_signer_server::persist::model::ChainTrackerEntry; -use lightning_signer_server::persist::model::NodeChannelId; +use lightning_signer_server::persist::model::{ + AllowlistItemEntry, ChainTrackerEntry, ChannelEntry, NodeEntry, +}; +use std::string::String; use lightning_signer::persist::model::{ ChannelEntry as CoreChannelEntry, NodeEntry as CoreNodeEntry, @@ -44,8 +40,8 @@ impl FsPersister { } fn get_channel_key(channel_id: &[u8]) -> &[u8] { - let length = channel_id.len(); - channel_id.get(length-11..length-7).unwrap() + let length = channel_id.len(); + channel_id.get(length - 11..length - 7).unwrap() } impl Persist for FsPersister { diff --git a/signer/src/lib.rs b/signer/src/lib.rs index 0d665c3..9b60eb5 100644 --- a/signer/src/lib.rs +++ b/signer/src/lib.rs @@ -1,5 +1,4 @@ -use lightning_signer::persist::{DummyPersister, Persist}; -// use lightning_signer::Arc; +use lightning_signer::persist::Persist; use std::sync::Arc; use vls_protocol::model::PubKey; use vls_protocol::msgs::{self, read_serial_request_header, write_serial_response_header, Message};