@@ -38,14 +38,14 @@ mod tests {
3838 // Add a checkpoint header at height 1000
3939 let checkpoint_header = create_test_header ( BlockHash :: from ( [ 0u8 ; 32 ] ) , 1000 ) ;
4040 storage. store_header ( & checkpoint_header, 1000 ) . expect ( "Failed to store checkpoint" ) ;
41- chain_state. add_header ( checkpoint_header. clone ( ) ) ;
41+ chain_state. add_header ( checkpoint_header) ;
4242
4343 // Add more headers building on checkpoint
4444 let mut prev_hash = checkpoint_header. block_hash ( ) ;
4545 for i in 1 ..5 {
4646 let header = create_test_header ( prev_hash, 1000 + i) ;
4747 storage. store_header ( & header, 1000 + i) . expect ( "Failed to store header" ) ;
48- chain_state. add_header ( header. clone ( ) ) ;
48+ chain_state. add_header ( header) ;
4949 prev_hash = header. block_hash ( ) ;
5050 }
5151
@@ -70,14 +70,14 @@ mod tests {
7070 // Setup genesis and main chain
7171 let genesis = genesis_block ( Network :: Dash ) . header ;
7272 storage. store_header ( & genesis, 0 ) . expect ( "Failed to store genesis" ) ;
73- chain_state. add_header ( genesis. clone ( ) ) ;
73+ chain_state. add_header ( genesis) ;
7474
7575 // Build main chain
7676 let mut main_chain_tip = genesis. block_hash ( ) ;
7777 for i in 1 ..10 {
7878 let header = create_test_header ( main_chain_tip, i) ;
7979 storage. store_header ( & header, i) . expect ( "Failed to store header" ) ;
80- chain_state. add_header ( header. clone ( ) ) ;
80+ chain_state. add_header ( header) ;
8181 main_chain_tip = header. block_hash ( ) ;
8282 }
8383
@@ -122,12 +122,12 @@ mod tests {
122122 // Setup genesis and build a main chain
123123 let genesis = genesis_block ( Network :: Dash ) . header ;
124124 storage. store_header ( & genesis, 0 ) . expect ( "Failed to store genesis" ) ;
125- chain_state. add_header ( genesis. clone ( ) ) ;
125+ chain_state. add_header ( genesis) ;
126126
127127 // Build main chain past genesis
128128 let header1 = create_test_header ( genesis. block_hash ( ) , 1 ) ;
129129 storage. store_header ( & header1, 1 ) . expect ( "Failed to store header" ) ;
130- chain_state. add_header ( header1. clone ( ) ) ;
130+ chain_state. add_header ( header1) ;
131131
132132 // Create more forks than the limit from genesis (not tip)
133133 let mut created_forks = Vec :: new ( ) ;
@@ -149,7 +149,7 @@ mod tests {
149149 // Since all forks have equal work, eviction order is not guaranteed
150150 // Just verify we have 3 unique forks
151151 assert_eq ! ( fork_nonces. len( ) , 3 ) ;
152- assert ! ( fork_nonces. iter( ) . all( |& n| n >= 100 && n <= 104 ) ) ;
152+ assert ! ( fork_nonces. iter( ) . all( |& n| ( 100 ..= 104 ) . contains ( & n ) ) ) ;
153153 }
154154
155155 #[ test]
@@ -161,12 +161,12 @@ mod tests {
161161 // Setup genesis and build a main chain
162162 let genesis = genesis_block ( Network :: Dash ) . header ;
163163 storage. store_header ( & genesis, 0 ) . expect ( "Failed to store genesis" ) ;
164- chain_state. add_header ( genesis. clone ( ) ) ;
164+ chain_state. add_header ( genesis) ;
165165
166166 // Build main chain past genesis
167167 let header1 = create_test_header ( genesis. block_hash ( ) , 1 ) ;
168168 storage. store_header ( & header1, 1 ) . expect ( "Failed to store header" ) ;
169- chain_state. add_header ( header1. clone ( ) ) ;
169+ chain_state. add_header ( header1) ;
170170
171171 // Create two forks from genesis (not tip)
172172 let fork1_header = create_test_header ( genesis. block_hash ( ) , 100 ) ;
@@ -207,14 +207,14 @@ mod tests {
207207 // Setup genesis
208208 let genesis = genesis_block ( Network :: Dash ) . header ;
209209 storage. store_header ( & genesis, 0 ) . expect ( "Failed to store genesis" ) ;
210- chain_state. lock ( ) . unwrap ( ) . add_header ( genesis. clone ( ) ) ;
210+ chain_state. lock ( ) . unwrap ( ) . add_header ( genesis) ;
211211
212212 // Build a base chain
213213 let mut prev_hash = genesis. block_hash ( ) ;
214214 for i in 1 ..20 {
215215 let header = create_test_header ( prev_hash, i) ;
216216 storage. store_header ( & header, i) . expect ( "Failed to store header" ) ;
217- chain_state. lock ( ) . unwrap ( ) . add_header ( header. clone ( ) ) ;
217+ chain_state. lock ( ) . unwrap ( ) . add_header ( header) ;
218218 prev_hash = header. block_hash ( ) ;
219219 }
220220
@@ -229,7 +229,7 @@ mod tests {
229229 let handle = thread:: spawn ( move || {
230230 // Each thread creates forks at different heights
231231 for i in 0 ..10 {
232- let fork_height = ( thread_id * 3 + i % 3 ) as u32 ;
232+ let fork_height = thread_id * 3 + i % 3 ;
233233 let chain_state_lock = chain_state_clone. lock ( ) . unwrap ( ) ;
234234
235235 if let Some ( fork_point_header) = chain_state_lock. header_at_height ( fork_height)
@@ -262,12 +262,12 @@ mod tests {
262262 let forks = detector_lock. get_forks ( ) ;
263263
264264 // Should have multiple forks but within the limit
265- assert ! ( forks. len ( ) > 0 ) ;
265+ assert ! ( ! forks. is_empty ( ) ) ;
266266 assert ! ( forks. len( ) <= 50 ) ;
267267
268268 // All forks should have valid structure
269269 for fork in forks {
270- assert ! ( fork. headers. len ( ) > 0 ) ;
270+ assert ! ( ! fork. headers. is_empty ( ) ) ;
271271 assert_eq ! ( fork. tip_hash, fork. headers. last( ) . unwrap( ) . block_hash( ) ) ;
272272 assert_eq ! ( fork. tip_height, fork. fork_height + fork. headers. len( ) as u32 ) ;
273273 }
@@ -287,7 +287,7 @@ mod tests {
287287 // Add genesis
288288 let genesis = genesis_block ( Network :: Dash ) . header ;
289289 storage. store_header ( & genesis, 0 ) . expect ( "Failed to store genesis" ) ;
290- chain_state. add_header ( genesis. clone ( ) ) ;
290+ chain_state. add_header ( genesis) ;
291291
292292 // Test 2: Header connecting to non-existent block
293293 let phantom_hash = BlockHash :: from_raw_hash ( dashcore_hashes:: hash_x11:: Hash :: hash ( & [ 42u8 ] ) ) ;
@@ -310,12 +310,12 @@ mod tests {
310310 // Setup genesis and build a main chain
311311 let genesis = genesis_block ( Network :: Dash ) . header ;
312312 storage. store_header ( & genesis, 0 ) . expect ( "Failed to store genesis" ) ;
313- chain_state. add_header ( genesis. clone ( ) ) ;
313+ chain_state. add_header ( genesis) ;
314314
315315 // Build main chain past genesis
316316 let header1 = create_test_header ( genesis. block_hash ( ) , 1 ) ;
317317 storage. store_header ( & header1, 1 ) . expect ( "Failed to store header" ) ;
318- chain_state. add_header ( header1. clone ( ) ) ;
318+ chain_state. add_header ( header1) ;
319319
320320 // Create multiple forks from genesis (not tip)
321321 let mut fork_tips = Vec :: new ( ) ;
@@ -328,16 +328,16 @@ mod tests {
328328 assert_eq ! ( detector. get_forks( ) . len( ) , 5 ) ;
329329
330330 // Remove specific forks
331- for i in 0 .. 3 {
332- let removed = detector. remove_fork ( & fork_tips [ i ] ) ;
331+ for tip in fork_tips . iter ( ) . take ( 3 ) {
332+ let removed = detector. remove_fork ( tip ) ;
333333 assert ! ( removed. is_some( ) ) ;
334334 }
335335
336336 assert_eq ! ( detector. get_forks( ) . len( ) , 2 ) ;
337337
338338 // Verify removed forks can't be found
339- for i in 0 .. 3 {
340- assert ! ( detector. get_fork( & fork_tips [ i ] ) . is_none( ) ) ;
339+ for tip in fork_tips . iter ( ) . take ( 3 ) {
340+ assert ! ( detector. get_fork( tip ) . is_none( ) ) ;
341341 }
342342
343343 // Clear all remaining forks
@@ -355,7 +355,7 @@ mod tests {
355355 // Add genesis to storage and chain state
356356 let genesis = genesis_block ( Network :: Dash ) . header ;
357357 storage. store_header ( & genesis, 0 ) . expect ( "Failed to store genesis" ) ;
358- chain_state. add_header ( genesis. clone ( ) ) ;
358+ chain_state. add_header ( genesis) ;
359359
360360 // Chain state tip is at genesis (height 0)
361361 assert_eq ! ( chain_state. tip_height( ) , 0 ) ;
@@ -374,13 +374,13 @@ mod tests {
374374
375375 // Add headers to chain state but not storage (simulating sync issue)
376376 let genesis = genesis_block ( Network :: Dash ) . header ;
377- chain_state. add_header ( genesis. clone ( ) ) ;
377+ chain_state. add_header ( genesis) ;
378378
379379 let header1 = create_test_header ( genesis. block_hash ( ) , 1 ) ;
380- chain_state. add_header ( header1. clone ( ) ) ;
380+ chain_state. add_header ( header1) ;
381381
382382 let header2 = create_test_header ( header1. block_hash ( ) , 2 ) ;
383- chain_state. add_header ( header2. clone ( ) ) ;
383+ chain_state. add_header ( header2) ;
384384
385385 // Try to extend from header1 (in chain state but not storage)
386386 let header3 = create_test_header ( header1. block_hash ( ) , 3 ) ;
0 commit comments