Fixes

Author: ndiezel0

apps/hellgate/src/hg_invoice_payment.erl

@@ -1958,23 +1958,19 @@ run_routing_decision_pipeline(Ctx0, VS, St) ->
     %% NOTE Since this is routing step then current attempt is not yet
     %% accounted for in `St`.
     NewIter = get_iter(St) + 1,
-    {TokenFilterFn, ChooseRouteFn} = cascade_pipeline_fns(St),
     hg_routing_ctx:pipeline(
         Ctx0,
         [
             fun(Ctx) -> filter_attempted_routes(Ctx, St) end,
-            TokenFilterFn,
+            fun(Ctx) -> filter_routes_by_recurrent_tokens(Ctx, St) end,
             fun(Ctx) -> filter_routes_with_limit_hold(Ctx, VS, NewIter, St) end,
             fun(Ctx) -> filter_routes_by_limit_overflow(Ctx, VS, NewIter, St) end,
             fun(Ctx) -> hg_routing:filter_by_blacklist(Ctx, build_blacklist_context(St)) end,
             fun hg_routing:filter_by_critical_provider_status/1,
-            ChooseRouteFn
+            fun hg_routing:choose_route_with_ctx/1
         ]
     ).
 
-cascade_pipeline_fns(St) ->
-    {fun(Ctx) -> filter_routes_by_recurrent_tokens(Ctx, St) end, fun hg_routing:choose_route_with_ctx/1}.
-
 produce_routing_events(#{error := Error} = Ctx, Revision, St) when Error =/= undefined ->
     %% TODO Pass failure subcode from error. Say, if last candidates were
     %% rejected because of provider gone critical, then use subcode to highlight

apps/hellgate/test/hg_direct_recurrent_tests_SUITE.erl

@@ -190,16 +190,12 @@ init_per_testcase(Name, C) ->
     ].
 
 -spec end_per_testcase(test_case_name(), config()) -> ok.
-end_per_testcase(cascade_recurrent_payment_success_test, _C) ->
-    restore_domain_after_cascade(),
-    ok;
-end_per_testcase(new_client_old_card_cascade_test, _C) ->
-    restore_domain_after_cascade(),
-    ok;
-end_per_testcase(cascade_exhaustion_test, _C) ->
-    restore_domain_after_cascade(),
-    ok;
-end_per_testcase(cascade_routing_filter_test, _C) ->
+end_per_testcase(Name, _C) when
+    Name =:= cascade_recurrent_payment_success_test;
+    Name =:= new_client_old_card_cascade_test;
+    Name =:= cascade_exhaustion_test;
+    Name =:= cascade_routing_filter_test
+->
     restore_domain_after_cascade(),
     ok;
 end_per_testcase(_Name, _C) ->

apps/hellgate/test/hg_dummy_provider.erl

@@ -613,7 +613,7 @@ get_payment_tool_scenario(
     mobile_commerce;
 get_payment_tool_scenario({'bank_card', #domain_BankCard{token = Token} = BCard}) ->
     %% Strip unique test suffix (e.g. <<"no_preauth/42">> -> <<"no_preauth">>)
-    [Base, _Suffix] = binary:split(Token, <<"/">>),
+    [Base | _Suffix] = binary:split(Token, <<"/">>),
     get_payment_tool_scenario({'bank_card', BCard#domain_BankCard{token = Base}}).
 
 -type tokenized_bank_card_payment_system() ::