IMP-278: Bumps valitydev/damsel@8e034bc (#142)

* IMP-278: Bumps valitydev/damsel@8e034bc

* Bumps CI

.github/workflows/erlang-checks.yaml

@@ -30,7 +30,7 @@ jobs:
   run:
     name: Run checks
     needs: setup
-    uses: valitydev/erlang-workflows/.github/workflows/erlang-parallel-build.yml@v1.0.14
+    uses: valitydev/erlang-workflows/.github/workflows/erlang-parallel-build.yml@v1.0.15
     with:
       otp-version: ${{ needs.setup.outputs.otp-version }}
       rebar-version: ${{ needs.setup.outputs.rebar-version }}

apps/hellgate/src/hg_varset.erl

@@ -17,7 +17,6 @@
     shop_id => dmsl_domain_thrift:'ShopID'(),
     risk_score => hg_inspector:risk_score(),
     flow => instant | {hold, dmsl_domain_thrift:'HoldLifetime'()},
-    payout_method => dmsl_domain_thrift:'PayoutMethodRef'(),
     wallet_id => dmsl_domain_thrift:'WalletID'(),
     identification_level => dmsl_domain_thrift:'ContractorIdentificationLevel'()
 }.
@@ -28,7 +27,6 @@ prepare_varset(Varset) ->
         category = genlib_map:get(category, Varset),
         currency = genlib_map:get(currency, Varset),
         amount = genlib_map:get(cost, Varset),
-        payout_method = genlib_map:get(payout_method, Varset),
         wallet_id = genlib_map:get(wallet_id, Varset),
         payment_tool = genlib_map:get(payment_tool, Varset),
         identification_level = genlib_map:get(identification_level, Varset),
@@ -41,7 +39,6 @@ prepare_contract_terms_varset(Varset) ->
     #payproc_ComputeContractTermsVarset{
         amount = genlib_map:get(cost, Varset),
         shop_id = genlib_map:get(shop_id, Varset),
-        payout_method = genlib_map:get(payout_method, Varset),
         payment_tool = genlib_map:get(payment_tool, Varset),
         wallet_id = genlib_map:get(wallet_id, Varset),
         bin_data = genlib_map:get(bin_data, Varset)
@@ -51,6 +48,5 @@ prepare_contract_terms_varset(Varset) ->
 prepare_shop_terms_varset(Varset) ->
     #payproc_ComputeShopTermsVarset{
         amount = genlib_map:get(cost, Varset),
-        payout_method = genlib_map:get(payout_method, Varset),
         payment_tool = genlib_map:get(payment_tool, Varset)
     }.

apps/hellgate/test/hg_ct_helper.erl

@@ -425,13 +425,11 @@ create_shop_(
 ) ->
     ShopID = hg_utils:unique_id(),
     ContractID = hg_utils:unique_id(),
-    PayoutToolID = hg_utils:unique_id(),
 
-    ShopParams = make_shop_params(Category, ContractID, PayoutToolID),
+    ShopParams = make_shop_params(Category, ContractID),
     ShopAccountParams = #payproc_ShopAccountParams{currency = ?cur(Currency)},
 
     ContractParams = make_contract_params(TemplateRef, PaymentInstRef),
-    PayoutToolParams = make_payout_tool_params(),
 
     TurnoverLimits1 = genlib:define(TurnoverLimits0, ordsets:new()),
 
@@ -440,14 +438,6 @@ create_shop_(
             id = ContractID,
             modification = {creation, ContractParams}
         }},
-        {contract_modification, #payproc_ContractModificationUnit{
-            id = ContractID,
-            modification =
-                {payout_tool_modification, #payproc_PayoutToolModificationUnit{
-                    payout_tool_id = PayoutToolID,
-                    modification = {creation, PayoutToolParams}
-                }}
-        }},
         ?shop_modification(ShopID, {creation, ShopParams}),
         ?shop_modification(ShopID, {shop_account_creation, ShopAccountParams}),
         ?shop_modification(ShopID, {turnover_limits_modification, TurnoverLimits1})
@@ -470,13 +460,12 @@ create_party_and_shop(PartyID, Category, Currency, TemplateRef, PaymentInstRef,
     _ = create_party(PartyID, Client),
     create_shop(PartyID, Category, Currency, TemplateRef, PaymentInstRef, Client).
 
-make_shop_params(Category, ContractID, PayoutToolID) ->
+make_shop_params(Category, ContractID) ->
     #payproc_ShopParams{
         category = Category,
         location = {url, <<>>},
         details = #domain_ShopDetails{name = <<"Battle Ready Shop">>},
-        contract_id = ContractID,
-        payout_tool_id = PayoutToolID
+        contract_id = ContractID
     }.
 
 make_party_params() ->
@@ -559,19 +548,6 @@ make_contractor() ->
             russian_bank_account = BankAccount
         }}}.
 
--spec make_payout_tool_params() -> dmsl_payproc_thrift:'PayoutToolParams'().
-make_payout_tool_params() ->
-    #payproc_PayoutToolParams{
-        currency = ?cur(<<"RUB">>),
-        tool_info =
-            {russian_bank_account, #domain_RussianBankAccount{
-                account = <<"4276300010908312893">>,
-                bank_name = <<"SomeBank">>,
-                bank_post_account = <<"123129876">>,
-                bank_bik = <<"66642666">>
-            }}
-    }.
-
 -spec make_invoice_params(party_id(), shop_id(), binary(), cash()) -> invoice_params().
 make_invoice_params(PartyID, ShopID, Product, Cost) ->
     make_invoice_params(PartyID, ShopID, Product, make_due_date(), Cost).

compose.yaml

@@ -97,7 +97,7 @@ services:
       disable: true
 
   party-management:
-    image: ghcr.io/valitydev/party-management:sha-7c202dc
+    image: ghcr.io/valitydev/party-management:sha-e16301b
     command: /opt/party-management/bin/party-management foreground
     depends_on:
       machinegun:

rebar.lock

@@ -21,7 +21,7 @@
  {<<"ctx">>,{pkg,<<"ctx">>,<<"0.6.0">>},2},
  {<<"damsel">>,
   {git,"https://github.com/valitydev/damsel.git",
-       {ref,"e5d3c83a240ba716348c6fbd816ea8e4d864472f"}},
+       {ref,"8e034bc74b1f4ed0e00dd63d0c3ca9c922be1c47"}},
   0},
  {<<"dmt_client">>,
   {git,"https://github.com/valitydev/dmt-client.git",