@@ -316,18 +316,17 @@ mod test {
316316 common:: ValidatorSpecification , import_validators:: tests:: TestBuilder as ImportTestBuilder ,
317317 } ;
318318 use account_utils:: eth2_keystore:: KeystoreBuilder ;
319- use account_utils:: ZeroizeString ;
320319 use beacon_chain:: test_utils:: { AttestationStrategy , BlockStrategy } ;
321320 use eth2:: lighthouse_vc:: types:: KeystoreJsonStr ;
322321 use http_api:: test_utils:: InteractiveTester ;
323322 use std:: {
324323 fs:: { self , File } ,
325324 io:: Write ,
326- str:: FromStr ,
327325 sync:: Arc ,
328326 } ;
329327 use types:: { ChainSpec , MainnetEthSpec } ;
330328 use validator_http_api:: { test_utils:: ApiTester , Config as HttpConfig } ;
329+ use zeroize:: Zeroizing ;
331330 type E = MainnetEthSpec ;
332331
333332 struct TestBuilder {
@@ -412,7 +411,7 @@ mod test {
412411
413412 let local_validators: Vec < ValidatorSpecification > = vec ! [ ValidatorSpecification {
414413 voting_keystore: KeystoreJsonStr ( keystore) ,
415- voting_keystore_password: ZeroizeString :: from_str ( "password" ) . unwrap ( ) ,
414+ voting_keystore_password: Zeroizing :: new ( "password" . into ( ) ) ,
416415 slashing_protection: None ,
417416 fee_recipient: None ,
418417 gas_limit: None ,
@@ -429,11 +428,11 @@ mod test {
429428 self . beacon_node. harness. validator_keypairs[ index_of_validators_to_exit] . pk
430429 ) ;
431430
432- let validators_to_exit = self . beacon_node . harness . validator_keypairs
431+ let validators_to_exit = vec ! [ self . beacon_node. harness. validator_keypairs
433432 [ index_of_validators_to_exit]
434433 . pk
435434 . clone( )
436- . into ( ) ;
435+ . into( ) ] ;
437436
438437 let import_config = builder. get_import_config ( ) ;
439438
@@ -458,6 +457,7 @@ mod test {
458457 validators_to_exit,
459458 beacon_url : Some ( beacon_url) ,
460459 exit_epoch : None ,
460+ signature : false ,
461461 } ) ;
462462
463463 self . validators = local_validators. clone ( ) ;
@@ -528,7 +528,7 @@ mod test {
528528 self . beacon_node. harness. get_current_slot( )
529529 ) ;
530530
531- let validator_to_exit = self . exit_config . as_ref ( ) . unwrap ( ) . validators_to_exit ;
531+ let validator_to_exit = self . exit_config . as_ref ( ) . unwrap ( ) . validators_to_exit [ 0 ] ;
532532 println ! ( "Attempting to exit validator {:?}" , validator_to_exit) ;
533533
534534 let mut current_state = self . beacon_node . harness . get_current_state ( ) ;
@@ -545,7 +545,7 @@ mod test {
545545 validator. activation_epoch, validator. exit_epoch
546546 ) ;
547547
548- let result = run ( self . exit_config . clone ( ) . unwrap ( ) ) . await ;
548+ let result = run :: < E > ( self . exit_config . clone ( ) . unwrap ( ) ) . await ;
549549
550550 if result. is_ok ( ) {
551551 return TestResult { result : Ok ( ( ) ) } ;
0 commit comments