Skip to content

Commit dabcdad

Browse files
AhmedSolimanAhmedSoliman
committed
Remove PartialEq requirement from Actions
1 parent d3fbbd7 commit dabcdad

File tree

4 files changed

+49
-49
lines changed

4 files changed

+49
-49
lines changed

‎crates/worker/src/partition/state_machine/actions.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use restate_wal_protocol::timer::TimerKeyValue;
2626

2727
pub type ActionCollector = Vec<Action>;
2828

29-
#[derive(derive_more::Debug, Eq, PartialEq, strum::IntoStaticStr)]
29+
#[derive(derive_more::Debug, strum::IntoStaticStr)]
3030
pub enum Action {
3131
/// Notifies the scheduler about a vqueue inbox event (e.g, enqueue, run permitted, etc.)
3232
VQEvent(VQueueEvent<EntryCard>),

‎crates/worker/src/partition/state_machine/lifecycle/version_barrier.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ mod tests {
5454
use restate_wal_protocol::Command;
5555
use restate_wal_protocol::control::VersionBarrier;
5656

57+
use crate::partition::state_machine::StateMachine;
5758
use crate::partition::state_machine::tests::TestEnv;
58-
use crate::partition::state_machine::{Action, StateMachine};
5959

6060
#[restate_core::test]
6161
async fn stop_at_version_barrier() {
@@ -121,7 +121,7 @@ mod tests {
121121
}))
122122
.await;
123123

124-
assert_that!(result, ok(eq(Vec::<Action>::new())));
124+
assert_that!(result, ok(empty()));
125125

126126
{
127127
let applied = test_env.storage().get_min_restate_version().await.unwrap();
@@ -136,7 +136,7 @@ mod tests {
136136
}))
137137
.await;
138138

139-
assert_that!(result, ok(eq(Vec::<Action>::new())));
139+
assert_that!(result, ok(empty()));
140140
{
141141
let applied = test_env.storage().get_min_restate_version().await.unwrap();
142142
assert_that!(&applied, eq(SemanticRestateVersion::current()));
@@ -151,7 +151,7 @@ mod tests {
151151
}))
152152
.await;
153153

154-
assert_that!(result, ok(eq(Vec::<Action>::new())));
154+
assert_that!(result, ok(empty()));
155155

156156
{
157157
let applied = test_env.storage().get_min_restate_version().await.unwrap();

‎crates/worker/src/partition/state_machine/tests/delayed_send.rs‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ async fn run_send_with_delay(min_restate_version: SemanticRestateVersion) {
5151
all!(
5252
not(contains(matchers::actions::invoke_for_id(invocation_id))),
5353
contains(pat!(Action::RegisterTimer { .. })),
54-
contains(eq(Action::IngressSubmitNotification {
55-
request_id,
56-
execution_time: Some(wake_up_time),
57-
is_new_invocation: true
54+
contains(pat!(Action::IngressSubmitNotification {
55+
request_id: eq(request_id),
56+
execution_time: some(eq(wake_up_time)),
57+
is_new_invocation: eq(true)
5858
}))
5959
)
6060
);
@@ -71,10 +71,10 @@ async fn run_send_with_delay(min_restate_version: SemanticRestateVersion) {
7171
actions,
7272
all!(
7373
contains(matchers::actions::invoke_for_id(invocation_id)),
74-
not(contains(eq(Action::IngressSubmitNotification {
75-
request_id,
76-
execution_time: Some(wake_up_time),
77-
is_new_invocation: true,
74+
not(contains(pat!(Action::IngressSubmitNotification {
75+
request_id: eq(request_id),
76+
execution_time: some(eq(wake_up_time)),
77+
is_new_invocation: eq(true),
7878
})))
7979
)
8080
);
@@ -114,10 +114,10 @@ async fn send_with_delay_where_experimental_feature_journal_table_v2_is_enabled_
114114
all!(
115115
not(contains(matchers::actions::invoke_for_id(invocation_id))),
116116
contains(pat!(Action::RegisterTimer { .. })),
117-
contains(eq(Action::IngressSubmitNotification {
118-
request_id,
119-
execution_time: Some(wake_up_time),
120-
is_new_invocation: true
117+
contains(pat!(Action::IngressSubmitNotification {
118+
request_id: eq(request_id),
119+
execution_time: some(eq(wake_up_time)),
120+
is_new_invocation: eq(true)
121121
}))
122122
)
123123
);
@@ -137,10 +137,10 @@ async fn send_with_delay_where_experimental_feature_journal_table_v2_is_enabled_
137137
actions,
138138
all!(
139139
contains(matchers::actions::invoke_for_id(invocation_id)),
140-
not(contains(eq(Action::IngressSubmitNotification {
141-
request_id,
142-
execution_time: Some(wake_up_time),
143-
is_new_invocation: true,
140+
not(contains(pat!(Action::IngressSubmitNotification {
141+
request_id: eq(request_id),
142+
execution_time: some(eq(wake_up_time)),
143+
is_new_invocation: eq(true),
144144
})))
145145
)
146146
);
@@ -186,10 +186,10 @@ async fn send_with_delay_to_locked_virtual_object() {
186186
all!(
187187
not(contains(matchers::actions::invoke_for_id(invocation_id))),
188188
contains(pat!(Action::RegisterTimer { .. })),
189-
contains(eq(Action::IngressSubmitNotification {
190-
request_id,
191-
execution_time: Some(wake_up_time),
192-
is_new_invocation: true,
189+
contains(pat!(Action::IngressSubmitNotification {
190+
request_id: eq(request_id),
191+
execution_time: some(eq(wake_up_time)),
192+
is_new_invocation: eq(true),
193193
}))
194194
)
195195
);
@@ -215,10 +215,10 @@ async fn send_with_delay_to_locked_virtual_object() {
215215
actions,
216216
all!(
217217
not(contains(matchers::actions::invoke_for_id(invocation_id))),
218-
not(contains(eq(Action::IngressSubmitNotification {
219-
request_id,
220-
execution_time: Some(wake_up_time),
221-
is_new_invocation: true,
218+
not(contains(pat!(Action::IngressSubmitNotification {
219+
request_id: eq(request_id),
220+
execution_time: some(eq(wake_up_time)),
221+
is_new_invocation: eq(true),
222222
})))
223223
)
224224
);
@@ -275,10 +275,10 @@ async fn send_with_delay_and_idempotency_key() {
275275
all!(
276276
not(contains(matchers::actions::invoke_for_id(invocation_id))),
277277
contains(pat!(Action::RegisterTimer { .. })),
278-
contains(eq(Action::IngressSubmitNotification {
279-
request_id: request_id_1,
280-
execution_time,
281-
is_new_invocation: true,
278+
contains(pat!(Action::IngressSubmitNotification {
279+
request_id: eq(request_id_1),
280+
execution_time: eq(execution_time),
281+
is_new_invocation: eq(true),
282282
}))
283283
)
284284
);
@@ -304,10 +304,10 @@ async fn send_with_delay_and_idempotency_key() {
304304
actions,
305305
all!(
306306
not(contains(matchers::actions::invoke_for_id(invocation_id))),
307-
contains(eq(Action::IngressSubmitNotification {
308-
request_id: request_id_2,
309-
execution_time,
310-
is_new_invocation: false,
307+
contains(pat!(Action::IngressSubmitNotification {
308+
request_id: eq(request_id_2),
309+
execution_time: eq(execution_time),
310+
is_new_invocation: eq(false),
311311
}))
312312
)
313313
);

‎crates/worker/src/partition/state_machine/tests/idempotency.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -425,10 +425,10 @@ async fn attach_with_send_service_invocation(#[case] use_same_request_id: bool)
425425
actions,
426426
all!(
427427
not(contains(pat!(Action::IngressResponse { .. }))),
428-
contains(eq(Action::IngressSubmitNotification {
429-
request_id: request_id_2,
430-
execution_time: None,
431-
is_new_invocation: use_same_request_id,
428+
contains(pat!(Action::IngressSubmitNotification {
429+
request_id: eq(request_id_2),
430+
execution_time: none(),
431+
is_new_invocation: eq(use_same_request_id),
432432
}))
433433
)
434434
);
@@ -528,10 +528,10 @@ async fn attach_inboxed_with_send_service_invocation() {
528528
not(contains(pat!(Action::Invoke {
529529
invocation_id: eq(invocation_id),
530530
}))),
531-
contains(eq(Action::IngressSubmitNotification {
532-
request_id: request_id_1,
533-
execution_time: None,
534-
is_new_invocation: true,
531+
contains(pat!(Action::IngressSubmitNotification {
532+
request_id: eq(request_id_1),
533+
execution_time: none(),
534+
is_new_invocation: eq(true),
535535
}))
536536
)
537537
);
@@ -572,10 +572,10 @@ async fn attach_inboxed_with_send_service_invocation() {
572572
invocation_id: eq(invocation_id),
573573
}))),
574574
not(contains(pat!(Action::IngressResponse { .. }))),
575-
contains(eq(Action::IngressSubmitNotification {
576-
request_id: request_id_2,
577-
execution_time: None,
578-
is_new_invocation: false,
575+
contains(pat!(Action::IngressSubmitNotification {
576+
request_id: eq(request_id_2),
577+
execution_time: none(),
578+
is_new_invocation: eq(false),
579579
}))
580580
)
581581
);

0 commit comments

Comments
 (0)