diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs index f53023a0635..be1fac442e5 100644 --- a/lightning-background-processor/src/lib.rs +++ b/lightning-background-processor/src/lib.rs @@ -593,14 +593,14 @@ use futures_util::{dummy_waker, Joiner, OptionalSelector, Selector, SelectorOutp /// # struct StoreSync {} /// # impl lightning::util::persist::KVStoreSync for StoreSync { /// # fn read(&self, primary_namespace: &str, secondary_namespace: &str, key: &str) -> io::Result> { Ok(Vec::new()) } -/// # fn write(&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: &[u8]) -> io::Result<()> { Ok(()) } +/// # fn write(&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec) -> io::Result<()> { Ok(()) } /// # fn remove(&self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool) -> io::Result<()> { Ok(()) } /// # fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result> { Ok(Vec::new()) } /// # } /// # struct Store {} /// # impl lightning::util::persist::KVStore for Store { /// # fn read(&self, primary_namespace: &str, secondary_namespace: &str, key: &str) -> Pin, io::Error>> + 'static + Send>> { todo!() } -/// # fn write(&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: &[u8]) -> Pin> + 'static + Send>> { todo!() } +/// # fn write(&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec) -> Pin> + 'static + Send>> { todo!() } /// # fn remove(&self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool) -> Pin> + 'static + Send>> { todo!() } /// # fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> Pin, io::Error>> + 'static + Send>> { todo!() } /// # } @@ -796,7 +796,7 @@ where SCORER_PERSISTENCE_PRIMARY_NAMESPACE, SCORER_PERSISTENCE_SECONDARY_NAMESPACE, SCORER_PERSISTENCE_KEY, - &scorer.encode(), + scorer.encode(), ) .await { @@ -932,7 +932,7 @@ where CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE, CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE, CHANNEL_MANAGER_PERSISTENCE_KEY, - &channel_manager.get_cm().encode(), + channel_manager.get_cm().encode(), ) .await }; @@ -977,7 +977,7 @@ where NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE, NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE, NETWORK_GRAPH_PERSISTENCE_KEY, - &network_graph.encode(), + network_graph.encode(), ) .await { @@ -1020,7 +1020,7 @@ where SCORER_PERSISTENCE_PRIMARY_NAMESPACE, SCORER_PERSISTENCE_SECONDARY_NAMESPACE, SCORER_PERSISTENCE_KEY, - &scorer.encode(), + scorer.encode(), ) .await { @@ -1128,7 +1128,7 @@ where CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE, CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE, CHANNEL_MANAGER_PERSISTENCE_KEY, - &channel_manager.get_cm().encode(), + channel_manager.get_cm().encode(), ) .await?; if let Some(ref scorer) = scorer { @@ -1137,7 +1137,7 @@ where SCORER_PERSISTENCE_PRIMARY_NAMESPACE, SCORER_PERSISTENCE_SECONDARY_NAMESPACE, SCORER_PERSISTENCE_KEY, - &scorer.encode(), + scorer.encode(), ) .await?; } @@ -1147,7 +1147,7 @@ where NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE, NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE, NETWORK_GRAPH_PERSISTENCE_KEY, - &network_graph.encode(), + network_graph.encode(), ) .await?; } @@ -1352,7 +1352,7 @@ impl BackgroundProcessor { SCORER_PERSISTENCE_PRIMARY_NAMESPACE, SCORER_PERSISTENCE_SECONDARY_NAMESPACE, SCORER_PERSISTENCE_KEY, - &scorer.encode(), + scorer.encode(), ) { log_error!(logger, "Error: Failed to persist scorer, check your disk and permissions {}", e) } @@ -1452,7 +1452,7 @@ impl BackgroundProcessor { CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE, CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE, CHANNEL_MANAGER_PERSISTENCE_KEY, - &channel_manager.get_cm().encode(), + channel_manager.get_cm().encode(), ))?; log_trace!(logger, "Done persisting ChannelManager."); } @@ -1484,7 +1484,7 @@ impl BackgroundProcessor { NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE, NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE, NETWORK_GRAPH_PERSISTENCE_KEY, - &network_graph.encode(), + network_graph.encode(), ) { log_error!(logger, "Error: Failed to persist network graph, check your disk and permissions {}",e); } @@ -1513,7 +1513,7 @@ impl BackgroundProcessor { SCORER_PERSISTENCE_PRIMARY_NAMESPACE, SCORER_PERSISTENCE_SECONDARY_NAMESPACE, SCORER_PERSISTENCE_KEY, - &scorer.encode(), + scorer.encode(), ) { log_error!(logger, "Error: Failed to persist scorer, check your disk and permissions {}", @@ -1556,14 +1556,14 @@ impl BackgroundProcessor { CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE, CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE, CHANNEL_MANAGER_PERSISTENCE_KEY, - &channel_manager.get_cm().encode(), + channel_manager.get_cm().encode(), )?; if let Some(ref scorer) = scorer { kv_store.write( SCORER_PERSISTENCE_PRIMARY_NAMESPACE, SCORER_PERSISTENCE_SECONDARY_NAMESPACE, SCORER_PERSISTENCE_KEY, - &scorer.encode(), + scorer.encode(), )?; } if let Some(network_graph) = gossip_sync.network_graph() { @@ -1571,7 +1571,7 @@ impl BackgroundProcessor { NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE, NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE, NETWORK_GRAPH_PERSISTENCE_KEY, - &network_graph.encode(), + network_graph.encode(), )?; } Ok(()) @@ -1916,7 +1916,7 @@ mod tests { } fn write( - &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: &[u8], + &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec, ) -> lightning::io::Result<()> { if primary_namespace == CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE && secondary_namespace == CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE diff --git a/lightning-persister/src/fs_store.rs b/lightning-persister/src/fs_store.rs index 5fac0cce617..a9edb4e2e6f 100644 --- a/lightning-persister/src/fs_store.rs +++ b/lightning-persister/src/fs_store.rs @@ -123,7 +123,7 @@ impl KVStoreSync for FilesystemStore { } fn write( - &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: &[u8], + &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec, ) -> lightning::io::Result<()> { check_namespace_key_validity(primary_namespace, secondary_namespace, Some(key), "write")?; diff --git a/lightning-persister/src/test_utils.rs b/lightning-persister/src/test_utils.rs index 18d643c7443..636967a6937 100644 --- a/lightning-persister/src/test_utils.rs +++ b/lightning-persister/src/test_utils.rs @@ -13,22 +13,23 @@ use lightning::{check_added_monitors, check_closed_broadcast, check_closed_event use std::panic::RefUnwindSafe; pub(crate) fn do_read_write_remove_list_persist(kv_store: &K) { - let data = [42u8; 32]; + let data = vec![42u8; 32]; let primary_namespace = "testspace"; let secondary_namespace = "testsubspace"; let key = "testkey"; // Test the basic KVStore operations. - kv_store.write(primary_namespace, secondary_namespace, key, &data).unwrap(); + kv_store.write(primary_namespace, secondary_namespace, key, data.clone()).unwrap(); // Test empty primary_namespace/secondary_namespace is allowed, but not empty primary_namespace // and non-empty secondary_namespace, and not empty key. - kv_store.write("", "", key, &data).unwrap(); - let res = std::panic::catch_unwind(|| kv_store.write("", secondary_namespace, key, &data)); + kv_store.write("", "", key, data.clone()).unwrap(); + let res = + std::panic::catch_unwind(|| kv_store.write("", secondary_namespace, key, data.clone())); assert!(res.is_err()); let res = std::panic::catch_unwind(|| { - kv_store.write(primary_namespace, secondary_namespace, "", &data) + kv_store.write(primary_namespace, secondary_namespace, "", data.clone()) }); assert!(res.is_err()); @@ -47,7 +48,7 @@ pub(crate) fn do_read_write_remove_list_persist( // Ensure we have no issue operating with primary_namespace/secondary_namespace/key being // KVSTORE_NAMESPACE_KEY_MAX_LEN let max_chars = "A".repeat(KVSTORE_NAMESPACE_KEY_MAX_LEN); - kv_store.write(&max_chars, &max_chars, &max_chars, &data).unwrap(); + kv_store.write(&max_chars, &max_chars, &max_chars, data.clone()).unwrap(); let listed_keys = kv_store.list(&max_chars, &max_chars).unwrap(); assert_eq!(listed_keys.len(), 1); @@ -66,7 +67,7 @@ pub(crate) fn do_test_data_migration source_store: &mut S, target_store: &mut T, ) { // We fill the source with some bogus keys. - let dummy_data = [42u8; 32]; + let dummy_data = vec![42u8; 32]; let num_primary_namespaces = 3; let num_secondary_namespaces = 3; let num_keys = 3; @@ -87,7 +88,7 @@ pub(crate) fn do_test_data_migration let key = format!("testkey{}", KVSTORE_NAMESPACE_KEY_ALPHABET.chars().nth(k).unwrap()); source_store - .write(&primary_namespace, &secondary_namespace, &key, &dummy_data) + .write(&primary_namespace, &secondary_namespace, &key, dummy_data.clone()) .unwrap(); expected_keys.push((primary_namespace.clone(), secondary_namespace.clone(), key)); } @@ -107,7 +108,7 @@ pub(crate) fn do_test_data_migration assert_eq!(target_list, expected_keys); for (p, s, k) in expected_keys.iter() { - assert_eq!(target_store.read(p, s, k).unwrap(), dummy_data); + assert_eq!(target_store.read(p, s, k).unwrap(), dummy_data.clone()); } } diff --git a/lightning/src/util/persist.rs b/lightning/src/util/persist.rs index 631b3313b2a..6b2ceaf4c34 100644 --- a/lightning/src/util/persist.rs +++ b/lightning/src/util/persist.rs @@ -118,7 +118,7 @@ pub trait KVStoreSync { ) -> Result, io::Error>; /// A synchronous version of the [`KVStore::write`] method. fn write( - &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: &[u8], + &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec, ) -> Result<(), io::Error>; /// A synchronous version of the [`KVStore::remove`] method. fn remove( @@ -159,7 +159,7 @@ where } fn write( - &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: &[u8], + &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec, ) -> Pin> + 'static + Send>> { let res = self.0.write(primary_namespace, secondary_namespace, key, buf); @@ -233,7 +233,7 @@ pub trait KVStore { /// /// Will create the given `primary_namespace` and `secondary_namespace` if not already present in the store. fn write( - &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: &[u8], + &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec, ) -> Pin> + 'static + Send>>; /// Removes any data that had previously been persisted under the given `key`. /// @@ -291,7 +291,7 @@ pub fn migrate_kv_store_data( for (primary_namespace, secondary_namespace, key) in &keys_to_migrate { let data = source_store.read(primary_namespace, secondary_namespace, key)?; - target_store.write(primary_namespace, secondary_namespace, key, &data)?; + target_store.write(primary_namespace, secondary_namespace, key, data)?; } Ok(()) @@ -310,7 +310,7 @@ impl Persist chain::ChannelMonitorUpdateStatus::Completed, Err(_) => chain::ChannelMonitorUpdateStatus::UnrecoverableError, @@ -325,7 +325,7 @@ impl Persist chain::ChannelMonitorUpdateStatus::Completed, Err(_) => chain::ChannelMonitorUpdateStatus::UnrecoverableError, @@ -346,7 +346,7 @@ impl Persist {}, Err(_e) => return, @@ -763,7 +763,7 @@ where CHANNEL_MONITOR_PERSISTENCE_PRIMARY_NAMESPACE, CHANNEL_MONITOR_PERSISTENCE_SECONDARY_NAMESPACE, monitor_key.as_str(), - &monitor_bytes, + monitor_bytes, ) { Ok(_) => chain::ChannelMonitorUpdateStatus::Completed, Err(e) => { @@ -804,7 +804,7 @@ where CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE, monitor_key.as_str(), update_name.as_str(), - &update.encode(), + update.encode(), ) { Ok(()) => chain::ChannelMonitorUpdateStatus::Completed, Err(e) => { @@ -876,7 +876,7 @@ where ARCHIVED_CHANNEL_MONITOR_PERSISTENCE_PRIMARY_NAMESPACE, ARCHIVED_CHANNEL_MONITOR_PERSISTENCE_SECONDARY_NAMESPACE, monitor_key.as_str(), - &monitor.encode(), + monitor.encode(), ) { Ok(()) => {}, Err(_e) => return, @@ -1487,7 +1487,7 @@ mod tests { CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE, &monitor_name.to_string(), UpdateName::from(1).as_str(), - &[0u8; 1], + vec![0u8; 1], ) .unwrap(); diff --git a/lightning/src/util/sweep.rs b/lightning/src/util/sweep.rs index bec72112c69..b72dddbcc7c 100644 --- a/lightning/src/util/sweep.rs +++ b/lightning/src/util/sweep.rs @@ -659,7 +659,7 @@ where OUTPUT_SWEEPER_PERSISTENCE_PRIMARY_NAMESPACE, OUTPUT_SWEEPER_PERSISTENCE_SECONDARY_NAMESPACE, OUTPUT_SWEEPER_PERSISTENCE_KEY, - &encoded, + encoded, ) } diff --git a/lightning/src/util/test_utils.rs b/lightning/src/util/test_utils.rs index 776d876bbc8..e5388b76049 100644 --- a/lightning/src/util/test_utils.rs +++ b/lightning/src/util/test_utils.rs @@ -858,7 +858,7 @@ impl KVStoreSync for TestStore { } fn write( - &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: &[u8], + &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec, ) -> io::Result<()> { if self.read_only { return Err(io::Error::new( @@ -875,7 +875,7 @@ impl KVStoreSync for TestStore { }; let outer_e = persisted_lock.entry(prefixed).or_insert(new_hash_map()); let mut bytes = Vec::new(); - bytes.write_all(buf)?; + bytes.write_all(&buf)?; outer_e.insert(key.to_string(), bytes); Ok(()) }