@@ -44,14 +44,15 @@ macro_rules! cycle {
44
44
( $tester: expr, $expected_state: expr ) => { {
45
45
use $crate:: test_extensions:: ExpectedMetrics ;
46
46
47
+ let runtime_tester: & mut RuntimeTester = & mut $tester;
47
48
let ( runtime_cycle_success, runtime_cycle_total) =
48
- $tester . get_runtime_cycle_success_and_total_since_startup_metrics( ) ;
49
+ runtime_tester . get_runtime_cycle_success_and_total_since_startup_metrics( ) ;
49
50
50
- RuntimeTester :: cycle( & mut $tester ) . await . unwrap( ) ;
51
- assert_eq!( $expected_state, $tester . runtime. get_state( ) ) ;
51
+ runtime_tester . cycle( ) . await . unwrap( ) ;
52
+ assert_eq!( $expected_state, runtime_tester . runtime. get_state( ) ) ;
52
53
53
54
assert_metrics_eq!(
54
- $tester . metrics_verifier,
55
+ runtime_tester . metrics_verifier,
55
56
ExpectedMetrics :: new( )
56
57
. runtime_cycle_success( runtime_cycle_success + 1 )
57
58
. runtime_cycle_total( runtime_cycle_total + 1 )
@@ -64,17 +65,19 @@ macro_rules! cycle_err {
64
65
( $tester: expr, $expected_state: expr ) => { {
65
66
use $crate:: test_extensions:: ExpectedMetrics ;
66
67
68
+ let runtime_tester: & mut RuntimeTester = & mut $tester;
67
69
let ( runtime_cycle_success, runtime_cycle_total) =
68
- $tester . get_runtime_cycle_success_and_total_since_startup_metrics( ) ;
70
+ runtime_tester . get_runtime_cycle_success_and_total_since_startup_metrics( ) ;
69
71
70
- let err = RuntimeTester :: cycle( & mut $tester)
72
+ let err = runtime_tester
73
+ . cycle( )
71
74
. await
72
75
. expect_err( "cycle tick should have returned an error" ) ;
73
76
slog_scope:: info!( "cycle_err result: {err:?}" ) ;
74
- assert_eq!( $expected_state, $tester . runtime. get_state( ) ) ;
77
+ assert_eq!( $expected_state, runtime_tester . runtime. get_state( ) ) ;
75
78
76
79
assert_metrics_eq!(
77
- $tester . metrics_verifier,
80
+ runtime_tester . metrics_verifier,
78
81
ExpectedMetrics :: new( )
79
82
. runtime_cycle_success( runtime_cycle_success)
80
83
. runtime_cycle_total( runtime_cycle_total + 1 )
@@ -85,31 +88,29 @@ macro_rules! cycle_err {
85
88
#[ macro_export]
86
89
macro_rules! assert_last_certificate_eq {
87
90
( $tester: expr, $expected_certificate: expr ) => { {
91
+ let runtime_tester: & mut RuntimeTester = & mut $tester;
88
92
if let Some ( signed_type) = $expected_certificate. get_signed_type( ) {
89
- RuntimeTester :: wait_until_signed_entity( & $tester, & signed_type)
90
- . await
91
- . unwrap( ) ;
93
+ runtime_tester. wait_until_signed_entity( & signed_type) . await . unwrap( ) ;
92
94
}
93
95
94
96
let is_synchronized_from_leader = false ;
95
- let last_certificate =
96
- RuntimeTester :: get_last_expected_certificate( & mut $tester , is_synchronized_from_leader)
97
- . await
98
- . unwrap( ) ;
97
+ let last_certificate = runtime_tester
98
+ . get_last_expected_certificate( is_synchronized_from_leader)
99
+ . await
100
+ . unwrap( ) ;
99
101
assert_eq!( $expected_certificate, last_certificate) ;
100
102
} } ;
101
103
( $tester: expr, synchronized_from_leader => $expected_certificate: expr ) => { {
104
+ let runtime_tester: & mut RuntimeTester = & mut $tester;
102
105
if let Some ( signed_type) = $expected_certificate. get_signed_type( ) {
103
- RuntimeTester :: wait_until_certificate( & $tester, & signed_type)
104
- . await
105
- . unwrap( ) ;
106
+ runtime_tester. wait_until_certificate( & signed_type) . await . unwrap( ) ;
106
107
}
107
108
108
109
let is_synchronized_from_leader = true ;
109
- let last_certificate =
110
- RuntimeTester :: get_last_expected_certificate( & mut $tester , is_synchronized_from_leader)
111
- . await
112
- . unwrap( ) ;
110
+ let last_certificate = runtime_tester
111
+ . get_last_expected_certificate( is_synchronized_from_leader)
112
+ . await
113
+ . unwrap( ) ;
113
114
assert_eq!( $expected_certificate, last_certificate) ;
114
115
} } ;
115
116
}
0 commit comments