projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move RGS `GraphSyncError` into the top-level module
[rust-lightning]
/
lightning-rapid-gossip-sync
/
src
/
processing.rs
diff --git
a/lightning-rapid-gossip-sync/src/processing.rs
b/lightning-rapid-gossip-sync/src/processing.rs
index fca318a5fa5f8cfac735ff8d3880819e8b6d93a0..9023b9ba38ca52c16d003bebaa21e1511c946d2e 100644
(file)
--- a/
lightning-rapid-gossip-sync/src/processing.rs
+++ b/
lightning-rapid-gossip-sync/src/processing.rs
@@
-2,7
+2,7
@@
use core::cmp::max;
use core::ops::Deref;
use core::sync::atomic::Ordering;
use core::ops::Deref;
use core::sync::atomic::Ordering;
-use bitcoin::
Block
Hash;
+use bitcoin::
blockdata::constants::Chain
Hash;
use bitcoin::secp256k1::PublicKey;
use lightning::ln::msgs::{
use bitcoin::secp256k1::PublicKey;
use lightning::ln::msgs::{
@@
-14,8
+14,7
@@
use lightning::{log_debug, log_warn, log_trace, log_given_level, log_gossip};
use lightning::util::ser::{BigSize, Readable};
use lightning::io;
use lightning::util::ser::{BigSize, Readable};
use lightning::io;
-use crate::error::GraphSyncError;
-use crate::RapidGossipSync;
+use crate::{GraphSyncError, RapidGossipSync};
#[cfg(all(feature = "std", not(test)))]
use std::time::{SystemTime, UNIX_EPOCH};
#[cfg(all(feature = "std", not(test)))]
use std::time::{SystemTime, UNIX_EPOCH};
@@
-67,9
+66,9
@@
impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
return Err(DecodeError::UnknownVersion.into());
}
return Err(DecodeError::UnknownVersion.into());
}
- let chain_hash:
Block
Hash = Readable::read(read_cursor)?;
- let ng_
genesis_hash = self.network_graph.get_genesis
_hash();
- if chain_hash != ng_
genesis
_hash {
+ let chain_hash:
Chain
Hash = Readable::read(read_cursor)?;
+ let ng_
chain_hash = self.network_graph.get_chain
_hash();
+ if chain_hash != ng_
chain
_hash {
return Err(
LightningError {
err: "Rapid Gossip Sync data's chain hash does not match the network graph's".to_owned(),
return Err(
LightningError {
err: "Rapid Gossip Sync data's chain hash does not match the network graph's".to_owned(),
@@
-269,9
+268,8
@@
mod tests {
use lightning::routing::gossip::NetworkGraph;
use lightning::util::test_utils::TestLogger;
use lightning::routing::gossip::NetworkGraph;
use lightning::util::test_utils::TestLogger;
- use crate::error::GraphSyncError;
use crate::processing::STALE_RGS_UPDATE_AGE_LIMIT_SECS;
use crate::processing::STALE_RGS_UPDATE_AGE_LIMIT_SECS;
- use crate::
RapidGossipSync
;
+ use crate::
{GraphSyncError, RapidGossipSync}
;
const VALID_RGS_BINARY: [u8; 300] = [
76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,
const VALID_RGS_BINARY: [u8; 300] = [
76, 68, 75, 1, 111, 226, 140, 10, 182, 241, 179, 114, 193, 166, 162, 70, 174, 99, 247,