@@ -9,7 +9,6 @@ use lightning::chain::keysinterface::{EntropySource, SignerProvider};
9
9
use lightning:: routing:: gossip:: NetworkGraph ;
10
10
use lightning:: routing:: scoring:: { ProbabilisticScorer , ProbabilisticScoringParameters } ;
11
11
use lightning:: util:: logger:: Logger ;
12
- use lightning:: util:: persist:: KVStorePersister ;
13
12
use lightning:: util:: ser:: { Readable , ReadableArgs } ;
14
13
15
14
use bitcoin:: hash_types:: { BlockHash , Txid } ;
90
89
}
91
90
Ok ( res)
92
91
}
92
+
93
93
/// Read a previously persisted [`NetworkGraph`] from the store.
94
94
pub ( crate ) fn read_network_graph < K : Deref , L : Deref > (
95
95
kv_store : K , logger : L ,
@@ -105,6 +105,7 @@ where
105
105
} ) ?;
106
106
Ok ( graph)
107
107
}
108
+
108
109
/// Read a previously persisted [`Scorer`] from the store.
109
110
pub ( crate ) fn read_scorer < K : Deref , G : Deref < Target = NetworkGraph < L > > , L : Deref > (
110
111
kv_store : K , network_graph : G , logger : L ,
@@ -121,10 +122,11 @@ where
121
122
} ) ?;
122
123
Ok ( scorer)
123
124
}
125
+
124
126
/// Read previously persisted events from the store.
125
127
pub ( crate ) fn read_event_queue < K : Deref > ( kv_store : K ) -> Result < EventQueue < K > , std:: io:: Error >
126
128
where
127
- K :: Target : KVStore + KVStorePersister ,
129
+ K :: Target : KVStore ,
128
130
{
129
131
let mut reader =
130
132
kv_store. read ( EVENT_QUEUE_PERSISTENCE_NAMESPACE , EVENT_QUEUE_PERSISTENCE_KEY ) ?;
@@ -133,10 +135,11 @@ where
133
135
} ) ?;
134
136
Ok ( event_queue)
135
137
}
138
+
136
139
/// Read previously persisted peer info from the store.
137
140
pub ( crate ) fn read_peer_info < K : Deref > ( kv_store : K ) -> Result < PeerInfoStorage < K > , std:: io:: Error >
138
141
where
139
- K :: Target : KVStore + KVStorePersister ,
142
+ K :: Target : KVStore ,
140
143
{
141
144
let mut reader = kv_store. read ( PEER_INFO_PERSISTENCE_NAMESPACE , PEER_INFO_PERSISTENCE_KEY ) ?;
142
145
let peer_info = PeerInfoStorage :: read ( & mut reader, kv_store) . map_err ( |_| {
@@ -147,10 +150,11 @@ where
147
150
} ) ?;
148
151
Ok ( peer_info)
149
152
}
153
+
150
154
/// Read previously persisted payments information from the store.
151
155
pub ( crate ) fn read_payment_info < K : Deref > ( kv_store : K ) -> Result < Vec < PaymentInfo > , std:: io:: Error >
152
156
where
153
- K :: Target : KVStore + KVStorePersister ,
157
+ K :: Target : KVStore ,
154
158
{
155
159
let mut res = Vec :: new ( ) ;
156
160
0 commit comments