@@ -101,8 +101,8 @@ BlockSourceResult<ValidatedBlockHeader> {
101101/// let mut cache = UnboundedCache::new();
102102/// let mut monitor_listener = (monitor, &*tx_broadcaster, &*fee_estimator, &*logger);
103103/// let listeners = vec![
104- /// (monitor_block_hash, &mut monitor_listener as &mut dyn chain::Listen),
105- /// (manager_block_hash, &mut manager as &mut dyn chain::Listen),
104+ /// (monitor_block_hash, &monitor_listener as &dyn chain::Listen),
105+ /// (manager_block_hash, &manager as &dyn chain::Listen),
106106/// ];
107107/// let chain_tip = init::synchronize_listeners(
108108/// block_source, Network::Bitcoin, &mut cache, listeners).await.unwrap();
@@ -125,7 +125,7 @@ pub async fn synchronize_listeners<B: BlockSource, C: Cache>(
125125 block_source : & mut B ,
126126 network : Network ,
127127 header_cache : & mut C ,
128- mut chain_listeners : Vec < ( BlockHash , & mut dyn chain:: Listen ) > ,
128+ mut chain_listeners : Vec < ( BlockHash , & dyn chain:: Listen ) > ,
129129) -> BlockSourceResult < ValidatedBlockHeader > {
130130 let best_header = validate_best_block_header ( block_source) . await ?;
131131
@@ -198,7 +198,7 @@ impl<'a, C: Cache> Cache for ReadOnlyCache<'a, C> {
198198}
199199
200200/// Wrapper for supporting dynamically sized chain listeners.
201- struct DynamicChainListener < ' a > ( & ' a mut dyn chain:: Listen ) ;
201+ struct DynamicChainListener < ' a > ( & ' a dyn chain:: Listen ) ;
202202
203203impl < ' a > chain:: Listen for DynamicChainListener < ' a > {
204204 fn block_connected ( & self , _block : & Block , _height : u32 ) {
@@ -211,7 +211,7 @@ impl<'a> chain::Listen for DynamicChainListener<'a> {
211211}
212212
213213/// A set of dynamically sized chain listeners, each paired with a starting block height.
214- struct ChainListenerSet < ' a > ( Vec < ( u32 , & ' a mut dyn chain:: Listen ) > ) ;
214+ struct ChainListenerSet < ' a > ( Vec < ( u32 , & ' a dyn chain:: Listen ) > ) ;
215215
216216impl < ' a > chain:: Listen for ChainListenerSet < ' a > {
217217 fn block_connected ( & self , block : & Block , height : u32 ) {
@@ -238,20 +238,20 @@ mod tests {
238238 async fn sync_from_same_chain ( ) {
239239 let mut chain = Blockchain :: default ( ) . with_height ( 4 ) ;
240240
241- let mut listener_1 = MockChainListener :: new ( )
241+ let listener_1 = MockChainListener :: new ( )
242242 . expect_block_connected ( * chain. at_height ( 2 ) )
243243 . expect_block_connected ( * chain. at_height ( 3 ) )
244244 . expect_block_connected ( * chain. at_height ( 4 ) ) ;
245- let mut listener_2 = MockChainListener :: new ( )
245+ let listener_2 = MockChainListener :: new ( )
246246 . expect_block_connected ( * chain. at_height ( 3 ) )
247247 . expect_block_connected ( * chain. at_height ( 4 ) ) ;
248- let mut listener_3 = MockChainListener :: new ( )
248+ let listener_3 = MockChainListener :: new ( )
249249 . expect_block_connected ( * chain. at_height ( 4 ) ) ;
250250
251251 let listeners = vec ! [
252- ( chain. at_height( 1 ) . block_hash, & mut listener_1 as & mut dyn chain:: Listen ) ,
253- ( chain. at_height( 2 ) . block_hash, & mut listener_2 as & mut dyn chain:: Listen ) ,
254- ( chain. at_height( 3 ) . block_hash, & mut listener_3 as & mut dyn chain:: Listen ) ,
252+ ( chain. at_height( 1 ) . block_hash, & listener_1 as & dyn chain:: Listen ) ,
253+ ( chain. at_height( 2 ) . block_hash, & listener_2 as & dyn chain:: Listen ) ,
254+ ( chain. at_height( 3 ) . block_hash, & listener_3 as & dyn chain:: Listen ) ,
255255 ] ;
256256 let mut cache = chain. header_cache ( 0 ..=4 ) ;
257257 match synchronize_listeners ( & mut chain, Network :: Bitcoin , & mut cache, listeners) . await {
@@ -267,26 +267,26 @@ mod tests {
267267 let fork_chain_2 = main_chain. fork_at_height ( 2 ) ;
268268 let fork_chain_3 = main_chain. fork_at_height ( 3 ) ;
269269
270- let mut listener_1 = MockChainListener :: new ( )
270+ let listener_1 = MockChainListener :: new ( )
271271 . expect_block_disconnected ( * fork_chain_1. at_height ( 4 ) )
272272 . expect_block_disconnected ( * fork_chain_1. at_height ( 3 ) )
273273 . expect_block_disconnected ( * fork_chain_1. at_height ( 2 ) )
274274 . expect_block_connected ( * main_chain. at_height ( 2 ) )
275275 . expect_block_connected ( * main_chain. at_height ( 3 ) )
276276 . expect_block_connected ( * main_chain. at_height ( 4 ) ) ;
277- let mut listener_2 = MockChainListener :: new ( )
277+ let listener_2 = MockChainListener :: new ( )
278278 . expect_block_disconnected ( * fork_chain_2. at_height ( 4 ) )
279279 . expect_block_disconnected ( * fork_chain_2. at_height ( 3 ) )
280280 . expect_block_connected ( * main_chain. at_height ( 3 ) )
281281 . expect_block_connected ( * main_chain. at_height ( 4 ) ) ;
282- let mut listener_3 = MockChainListener :: new ( )
282+ let listener_3 = MockChainListener :: new ( )
283283 . expect_block_disconnected ( * fork_chain_3. at_height ( 4 ) )
284284 . expect_block_connected ( * main_chain. at_height ( 4 ) ) ;
285285
286286 let listeners = vec ! [
287- ( fork_chain_1. tip( ) . block_hash, & mut listener_1 as & mut dyn chain:: Listen ) ,
288- ( fork_chain_2. tip( ) . block_hash, & mut listener_2 as & mut dyn chain:: Listen ) ,
289- ( fork_chain_3. tip( ) . block_hash, & mut listener_3 as & mut dyn chain:: Listen ) ,
287+ ( fork_chain_1. tip( ) . block_hash, & listener_1 as & dyn chain:: Listen ) ,
288+ ( fork_chain_2. tip( ) . block_hash, & listener_2 as & dyn chain:: Listen ) ,
289+ ( fork_chain_3. tip( ) . block_hash, & listener_3 as & dyn chain:: Listen ) ,
290290 ] ;
291291 let mut cache = fork_chain_1. header_cache ( 2 ..=4 ) ;
292292 cache. extend ( fork_chain_2. header_cache ( 3 ..=4 ) ) ;
@@ -304,21 +304,21 @@ mod tests {
304304 let fork_chain_2 = fork_chain_1. fork_at_height ( 2 ) ;
305305 let fork_chain_3 = fork_chain_2. fork_at_height ( 3 ) ;
306306
307- let mut listener_1 = MockChainListener :: new ( )
307+ let listener_1 = MockChainListener :: new ( )
308308 . expect_block_disconnected ( * fork_chain_1. at_height ( 4 ) )
309309 . expect_block_disconnected ( * fork_chain_1. at_height ( 3 ) )
310310 . expect_block_disconnected ( * fork_chain_1. at_height ( 2 ) )
311311 . expect_block_connected ( * main_chain. at_height ( 2 ) )
312312 . expect_block_connected ( * main_chain. at_height ( 3 ) )
313313 . expect_block_connected ( * main_chain. at_height ( 4 ) ) ;
314- let mut listener_2 = MockChainListener :: new ( )
314+ let listener_2 = MockChainListener :: new ( )
315315 . expect_block_disconnected ( * fork_chain_2. at_height ( 4 ) )
316316 . expect_block_disconnected ( * fork_chain_2. at_height ( 3 ) )
317317 . expect_block_disconnected ( * fork_chain_2. at_height ( 2 ) )
318318 . expect_block_connected ( * main_chain. at_height ( 2 ) )
319319 . expect_block_connected ( * main_chain. at_height ( 3 ) )
320320 . expect_block_connected ( * main_chain. at_height ( 4 ) ) ;
321- let mut listener_3 = MockChainListener :: new ( )
321+ let listener_3 = MockChainListener :: new ( )
322322 . expect_block_disconnected ( * fork_chain_3. at_height ( 4 ) )
323323 . expect_block_disconnected ( * fork_chain_3. at_height ( 3 ) )
324324 . expect_block_disconnected ( * fork_chain_3. at_height ( 2 ) )
@@ -327,9 +327,9 @@ mod tests {
327327 . expect_block_connected ( * main_chain. at_height ( 4 ) ) ;
328328
329329 let listeners = vec ! [
330- ( fork_chain_1. tip( ) . block_hash, & mut listener_1 as & mut dyn chain:: Listen ) ,
331- ( fork_chain_2. tip( ) . block_hash, & mut listener_2 as & mut dyn chain:: Listen ) ,
332- ( fork_chain_3. tip( ) . block_hash, & mut listener_3 as & mut dyn chain:: Listen ) ,
330+ ( fork_chain_1. tip( ) . block_hash, & listener_1 as & dyn chain:: Listen ) ,
331+ ( fork_chain_2. tip( ) . block_hash, & listener_2 as & dyn chain:: Listen ) ,
332+ ( fork_chain_3. tip( ) . block_hash, & listener_3 as & dyn chain:: Listen ) ,
333333 ] ;
334334 let mut cache = fork_chain_1. header_cache ( 2 ..=4 ) ;
335335 cache. extend ( fork_chain_2. header_cache ( 3 ..=4 ) ) ;
@@ -347,11 +347,11 @@ mod tests {
347347 let new_tip = main_chain. tip ( ) ;
348348 let old_tip = fork_chain. tip ( ) ;
349349
350- let mut listener = MockChainListener :: new ( )
350+ let listener = MockChainListener :: new ( )
351351 . expect_block_disconnected ( * old_tip)
352352 . expect_block_connected ( * new_tip) ;
353353
354- let listeners = vec ! [ ( old_tip. block_hash, & mut listener as & mut dyn chain:: Listen ) ] ;
354+ let listeners = vec ! [ ( old_tip. block_hash, & listener as & dyn chain:: Listen ) ] ;
355355 let mut cache = fork_chain. header_cache ( 2 ..=2 ) ;
356356 match synchronize_listeners ( & mut main_chain, Network :: Bitcoin , & mut cache, listeners) . await {
357357 Ok ( _) => {
0 commit comments