@@ -9,7 +9,6 @@ use lightning::chain::keysinterface::{EntropySource, SignerProvider};
99use lightning:: routing:: gossip:: NetworkGraph ;
1010use lightning:: routing:: scoring:: { ProbabilisticScorer , ProbabilisticScoringParameters } ;
1111use lightning:: util:: logger:: Logger ;
12- use lightning:: util:: persist:: KVStorePersister ;
1312use lightning:: util:: ser:: { Readable , ReadableArgs } ;
1413
1514use bitcoin:: hash_types:: { BlockHash , Txid } ;
9089 }
9190 Ok ( res)
9291}
92+
9393/// Read a previously persisted [`NetworkGraph`] from the store.
9494pub ( crate ) fn read_network_graph < K : Deref , L : Deref > (
9595 kv_store : K , logger : L ,
@@ -105,6 +105,7 @@ where
105105 } ) ?;
106106 Ok ( graph)
107107}
108+
108109/// Read a previously persisted [`Scorer`] from the store.
109110pub ( crate ) fn read_scorer < K : Deref , G : Deref < Target = NetworkGraph < L > > , L : Deref > (
110111 kv_store : K , network_graph : G , logger : L ,
@@ -121,10 +122,11 @@ where
121122 } ) ?;
122123 Ok ( scorer)
123124}
125+
124126/// Read previously persisted events from the store.
125127pub ( crate ) fn read_event_queue < K : Deref > ( kv_store : K ) -> Result < EventQueue < K > , std:: io:: Error >
126128where
127- K :: Target : KVStore + KVStorePersister ,
129+ K :: Target : KVStore ,
128130{
129131 let mut reader =
130132 kv_store. read ( EVENT_QUEUE_PERSISTENCE_NAMESPACE , EVENT_QUEUE_PERSISTENCE_KEY ) ?;
@@ -133,10 +135,11 @@ where
133135 } ) ?;
134136 Ok ( event_queue)
135137}
138+
136139/// Read previously persisted peer info from the store.
137140pub ( crate ) fn read_peer_info < K : Deref > ( kv_store : K ) -> Result < PeerInfoStorage < K > , std:: io:: Error >
138141where
139- K :: Target : KVStore + KVStorePersister ,
142+ K :: Target : KVStore ,
140143{
141144 let mut reader = kv_store. read ( PEER_INFO_PERSISTENCE_NAMESPACE , PEER_INFO_PERSISTENCE_KEY ) ?;
142145 let peer_info = PeerInfoStorage :: read ( & mut reader, kv_store) . map_err ( |_| {
@@ -147,10 +150,11 @@ where
147150 } ) ?;
148151 Ok ( peer_info)
149152}
153+
150154/// Read previously persisted payments information from the store.
151155pub ( crate ) fn read_payment_info < K : Deref > ( kv_store : K ) -> Result < Vec < PaymentInfo > , std:: io:: Error >
152156where
153- K :: Target : KVStore + KVStorePersister ,
157+ K :: Target : KVStore ,
154158{
155159 let mut res = Vec :: new ( ) ;
156160
0 commit comments