-
Notifications
You must be signed in to change notification settings - Fork 353
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
KVStore
upstreaming followups
#2563
Merged
valentinewallace
merged 2 commits into
lightningdevkit:main
from
tnull:2023-09-kvstore-followups
Sep 11, 2023
Merged
KVStore
upstreaming followups
#2563
valentinewallace
merged 2 commits into
lightningdevkit:main
from
tnull:2023-09-kvstore-followups
Sep 11, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
b2c28a6
to
9ea0d03
Compare
valentinewallace
previously approved these changes
Sep 8, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Works ✅
TheBlueMatt
reviewed
Sep 8, 2023
9ea0d03
to
aeaed62
Compare
Force-pushed including the following changes: > git diff-tree -U2 9ea0d03f aeaed628
diff --git a/lightning/src/util/persist.rs b/lightning/src/util/persist.rs
index 7a73aba0..372a094a 100644
--- a/lightning/src/util/persist.rs
+++ b/lightning/src/util/persist.rs
@@ -180,5 +180,4 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner, K: KVStore> Persist<ChannelSign
fn persist_new_channel(&self, funding_txo: OutPoint, monitor: &ChannelMonitor<ChannelSigner>, _update_id: MonitorUpdateId) -> chain::ChannelMonitorUpdateStatus {
let key = format!("{}_{}", funding_txo.txid.to_hex(), funding_txo.index);
- debug_assert!(key.len() > 65);
match self.write(
CHANNEL_MONITOR_PERSISTENCE_NAMESPACE,
@@ -193,5 +192,4 @@ impl<ChannelSigner: WriteableEcdsaChannelSigner, K: KVStore> Persist<ChannelSign
fn update_persisted_channel(&self, funding_txo: OutPoint, _update: Option<&ChannelMonitorUpdate>, monitor: &ChannelMonitor<ChannelSigner>, _update_id: MonitorUpdateId) -> chain::ChannelMonitorUpdateStatus {
let key = format!("{}_{}", funding_txo.txid.to_hex(), funding_txo.index);
- debug_assert!(key.len() > 65);
match self.write(
CHANNEL_MONITOR_PERSISTENCE_NAMESPACE,
@@ -219,6 +217,5 @@ where
CHANNEL_MONITOR_PERSISTENCE_NAMESPACE, CHANNEL_MONITOR_PERSISTENCE_SUB_NAMESPACE)?
{
- debug_assert!(stored_key.len() > 65);
- if stored_key.len() < 65 {
+ if stored_key.len() < 66 {
return Err(io::Error::new(
io::ErrorKind::InvalidData, |
TheBlueMatt
approved these changes
Sep 11, 2023
G8XSU
approved these changes
Sep 11, 2023
valentinewallace
approved these changes
Sep 11, 2023
8de8861
into
lightningdevkit:main
11 of 14 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #2561.
Addresses two last feedback items from #2472.