Epic: PRG layer

.github/workflows/erlang-checks.yml

@@ -38,5 +38,5 @@ jobs:
       thrift-version: ${{ needs.setup.outputs.thrift-version }}
       run-ct-with-compose: true
       use-coveralls: true
-      cache-version: v103
+      cache-version: v107
       upload-coverage: false

apps/ff_cth/src/ct_helper.erl

@@ -197,16 +197,17 @@ stop_app(AppName) ->
 
 -spec set_context(config()) -> ok.
 set_context(C) ->
-    ok = ff_context:save(
-        ff_context:create(#{
+    ok = op_context:save(
+        op_context:key(fistful),
+        op_context:create(#{
             party_client => party_client:create_client(),
             woody_context => cfg('$woody_ctx', C)
         })
     ).
 
 -spec unset_context() -> ok.
 unset_context() ->
-    ok = ff_context:cleanup().
+    ok = op_context:cleanup(fistful).
 
 %%
 

apps/ff_cth/src/ct_limiter.erl

@@ -13,7 +13,7 @@
 
 -type withdrawal() :: ff_withdrawal:withdrawal_state() | dmsl_wthd_domain_thrift:'Withdrawal'().
 -type limit() :: limproto_limiter_thrift:'Limit'().
--type config() :: ct_suite:ct_config().
+-type config() :: ct_helper:config().
 -type id() :: binary().
 
 -spec init_per_suite(config()) -> _.

apps/ff_cth/src/ct_payment_system.erl

@@ -83,7 +83,6 @@ start_processing_apps(Options) ->
         dmt_client,
         party_client,
         {fistful, [
-            {machinery_backend, progressor},
             {services, services(Options)}
         ]},
         ff_server,
@@ -150,6 +149,7 @@ start_optional_apps(_) ->
 
 setup_dominant(Config0, Options) ->
     Config1 = setup_dominant_internal(Config0, Options),
+    _ = ct_domain_config:cleanup(),
     Config2 = ct_limiter:init_per_suite(Config1),
     DomainConfig = domain_config(Config2, Options),
     _ = ct_domain_config:upsert(DomainConfig),
@@ -250,56 +250,41 @@ progressor_namespaces() ->
     #{
         'ff/source_v1' => #{
             processor => #{
-                client => machinery_prg_backend,
+                client => prg_machine,
                 options => #{
-                    namespace => 'ff/source_v1',
-                    %% TODO Party client create
-                    handler => {fistful, #{handler => ff_source_machine, party_client => #{}}},
-                    schema => ff_source_machinery_schema
+                    ns => 'ff/source_v1'
                 }
             }
         },
         'ff/destination_v2' => #{
             processor => #{
-                client => machinery_prg_backend,
+                client => prg_machine,
                 options => #{
-                    namespace => 'ff/destination_v2',
-                    %% TODO Party client create
-                    handler => {fistful, #{handler => ff_destination_machine, party_client => #{}}},
-                    schema => ff_destination_machinery_schema
+                    ns => 'ff/destination_v2'
                 }
             }
         },
         'ff/deposit_v1' => #{
             processor => #{
-                client => machinery_prg_backend,
+                client => prg_machine,
                 options => #{
-                    namespace => 'ff/deposit_v1',
-                    %% TODO Party client create
-                    handler => {fistful, #{handler => ff_deposit_machine, party_client => #{}}},
-                    schema => ff_deposit_machinery_schema
+                    ns => 'ff/deposit_v1'
                 }
             }
         },
         'ff/withdrawal_v2' => #{
             processor => #{
-                client => machinery_prg_backend,
+                client => prg_machine,
                 options => #{
-                    namespace => 'ff/withdrawal_v2',
-                    %% TODO Party client create
-                    handler => {fistful, #{handler => ff_withdrawal_machine, party_client => #{}}},
-                    schema => ff_withdrawal_machinery_schema
+                    ns => 'ff/withdrawal_v2'
                 }
             }
         },
         'ff/withdrawal/session_v2' => #{
             processor => #{
-                client => machinery_prg_backend,
+                client => prg_machine,
                 options => #{
-                    namespace => 'ff/withdrawal/session_v2',
-                    %% TODO Party client create
-                    handler => {fistful, #{handler => ff_withdrawal_session_machine, party_client => #{}}},
-                    schema => ff_withdrawal_session_machinery_schema
+                    ns => 'ff/withdrawal/session_v2'
                 }
             }
         }

apps/ff_server/src/ff_codec.erl

@@ -23,12 +23,15 @@
 -type decoded_value() :: decoded_value(any()).
 -type decoded_value(T) :: T.
 
+-type timestamp() :: {calendar:datetime(), non_neg_integer()}.
+
 -export_type([codec/0]).
 -export_type([type_name/0]).
 -export_type([encoded_value/0]).
 -export_type([encoded_value/1]).
 -export_type([decoded_value/0]).
 -export_type([decoded_value/1]).
+-export_type([timestamp/0]).
 
 %% Callbacks
 
@@ -298,7 +301,7 @@ marshal(_, Other) ->
 
 -spec unmarshal(type_name(), encoded_value()) -> decoded_value().
 unmarshal({list, T}, V) ->
-    [marshal(T, E) || E <- V];
+    [unmarshal(T, E) || E <- V];
 unmarshal({set, T}, V) ->
     ordsets:from_list([unmarshal(T, E) || E <- ordsets:to_list(V)]);
 unmarshal(id, V) ->
@@ -360,25 +363,13 @@ unmarshal(three_ds_verification, Value) when
         Value =:= authentication_could_not_be_performed
 ->
     Value;
+unmarshal(complex_action, undefined) ->
+    undefined;
 unmarshal(complex_action, #repairer_ComplexAction{
     timer = TimerAction,
     remove = RemoveAction
 }) ->
-    unmarshal(timer_action, TimerAction) ++ unmarshal(remove_action, RemoveAction);
-unmarshal(timer_action, undefined) ->
-    [];
-unmarshal(timer_action, {set_timer, SetTimerAction}) ->
-    [{set_timer, unmarshal(set_timer_action, SetTimerAction)}];
-unmarshal(timer_action, {unset_timer, #repairer_UnsetTimerAction{}}) ->
-    [unset_timer];
-unmarshal(remove_action, undefined) ->
-    [];
-unmarshal(remove_action, #repairer_RemoveAction{}) ->
-    [remove];
-unmarshal(set_timer_action, #repairer_SetTimerAction{
-    timer = Timer
-}) ->
-    unmarshal(timer, Timer);
+    unmarshal_repairer_complex_action(TimerAction, RemoveAction);
 unmarshal(timer, {timeout, Timeout}) ->
     {timeout, unmarshal(integer, Timeout)};
 unmarshal(timer, {deadline, Deadline}) ->
@@ -576,6 +567,15 @@ unmarshal(range, #'fistful_base_EventRange'{
 unmarshal(bool, V) when is_boolean(V) ->
     V.
 
+unmarshal_repairer_complex_action(_, #repairer_RemoveAction{}) ->
+    remove;
+unmarshal_repairer_complex_action(undefined, undefined) ->
+    idle;
+unmarshal_repairer_complex_action({set_timer, #repairer_SetTimerAction{timer = Timer}}, undefined) ->
+    prg_action:schedule_timer(unmarshal(timer, Timer));
+unmarshal_repairer_complex_action({unset_timer, _}, undefined) ->
+    suspend.
+
 maybe_unmarshal(_Type, undefined) ->
     undefined;
 maybe_unmarshal(Type, Value) ->
@@ -586,7 +586,7 @@ maybe_marshal(_Type, undefined) ->
 maybe_marshal(Type, Value) ->
     marshal(Type, Value).
 
--spec parse_timestamp(binary()) -> machinery:timestamp().
+-spec parse_timestamp(binary()) -> timestamp().
 parse_timestamp(Bin) ->
     try
         MicroSeconds = genlib_rfc3339:parse(Bin, microsecond),

apps/ff_server/src/ff_deposit_codec.erl

@@ -211,7 +211,7 @@ deposit_timestamped_change_codec_test() ->
         external_id => genlib:unique()
     },
     Change = {created, Deposit},
-    TimestampedChange = {ev, machinery_time:now(), Change},
+    TimestampedChange = {ev, {calendar:universal_time(), 0}, Change},
     Type = {struct, struct, {fistful_deposit_thrift, 'TimestampedChange'}},
     Binary = ff_proto_utils:serialize(Type, marshal(timestamped_change, TimestampedChange)),
     Decoded = ff_proto_utils:deserialize(Type, Binary),

apps/ff_server/src/ff_deposit_repair.erl

@@ -21,5 +21,11 @@ handle_function('Repair', {ID, Scenario}, _Opts) ->
         {error, notfound} ->
             woody_error:raise(business, #fistful_DepositNotFound{});
         {error, working} ->
-            woody_error:raise(business, #fistful_MachineAlreadyWorking{})
+            woody_error:raise(business, #fistful_MachineAlreadyWorking{});
+        {error, {failed, Reason}} ->
+            erlang:error(Reason);
+        {error, failed} ->
+            erlang:error(failed);
+        {error, {exception, Class, Reason}} ->
+            erlang:error({process_exception, Class, Reason})
     end.