Rebase

restatedev · May 20, 2024 · 9e10002 · 9e10002
1 parent 80a6ef9
commit 9e10002
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/crates/storage-api/src/storage.rs b/crates/storage-api/src/storage.rs
@@ -107,16 +107,16 @@ pub mod v1 {
             Ingress, PartitionProcessor, ResponseSink,
         };
         use crate::storage::v1::{
-            enriched_entry_header, entry_result,inbox_entry, invocation_resolution_result, invocation_status,
-            invocation_target, outbox_message,promise, response_result, source, span_relation,
-            submit_notification_sink, timer, virtual_object_status, BackgroundCallResolutionResult,
-            DedupSequenceNumber, Duration, EnrichedEntryHeader, EntryResult,EpochSequenceNumber, Header,
-            IdempotencyMetadata, InboxEntry, InvocationId, InvocationResolutionResult,
-            InvocationStatus, InvocationTarget, JournalEntry, JournalEntryId,JournalMeta, KvPair, OutboxMessage,
-           Promise, ResponseResult, SequenceNumber, ServiceId, ServiceInvocation,
+            enriched_entry_header, entry_result, inbox_entry, invocation_resolution_result,
+            invocation_status, invocation_target, outbox_message, promise, response_result, source,
+            span_relation, submit_notification_sink, timer, virtual_object_status,
+            BackgroundCallResolutionResult, DedupSequenceNumber, Duration, EnrichedEntryHeader,
+            EntryResult, EpochSequenceNumber, Header, IdempotencyMetadata, InboxEntry,
+            InvocationId, InvocationResolutionResult, InvocationStatus, InvocationTarget,
+            JournalEntry, JournalEntryId, JournalMeta, KvPair, OutboxMessage, Promise,
+            ResponseResult, SequenceNumber, ServiceId, ServiceInvocation,
             ServiceInvocationResponseSink, Source, SpanContext, SpanRelation, StateMutation,
-            SubmitNotificationSink, Timer,
-            VirtualObjectStatus,
+            SubmitNotificationSink, Timer, VirtualObjectStatus,
         };
         use crate::StorageError;
 

diff --git a/crates/worker/src/partition/state_machine/command_interpreter/mod.rs b/crates/worker/src/partition/state_machine/command_interpreter/mod.rs
@@ -29,7 +29,8 @@ use restate_storage_api::timer_table::Timer;
 use restate_storage_api::Result as StorageResult;
 use restate_types::errors::{
     InvocationError, InvocationErrorCode, ALREADY_COMPLETED_INVOCATION_ERROR,
-    CANCELED_INVOCATION_ERROR, GONE_INVOCATION_ERROR, KILLED_INVOCATION_ERROR, NOT_FOUND_INVOCATION_ERROR,
+    CANCELED_INVOCATION_ERROR, GONE_INVOCATION_ERROR, KILLED_INVOCATION_ERROR,
+    NOT_FOUND_INVOCATION_ERROR,
 };
 use restate_types::identifiers::{
     EntryIndex, IdempotencyId, InvocationId, JournalEntryId, PartitionKey, ServiceId,