FF-168 Update fistful-proto (#219)

This commit is contained in:
Andrey Fadeev 2020-05-22 18:02:17 +03:00 committed by GitHub
parent 2b05c52f60
commit 8f577db5e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 5 deletions

View File

@ -201,6 +201,7 @@ adjustment_codec_test() ->
},
Transfer = #{
id => genlib:unique(),
final_cash_flow => FinalCashFlow
},

View File

@ -201,6 +201,7 @@ adjustment_codec_test() ->
},
Transfer = #{
id => genlib:unique(),
final_cash_flow => FinalCashFlow
},

View File

@ -201,6 +201,7 @@ adjustment_codec_test() ->
},
Transfer = #{
id => genlib:unique(),
final_cash_flow => FinalCashFlow
},

View File

@ -339,6 +339,7 @@ p2p_transfer_codec_test() ->
},
PTransfer = #{
id => genlib:unique(),
final_cash_flow => FinalCashFlow
},

View File

@ -24,9 +24,10 @@ marshal(change, {status_changed, Status}) ->
marshal(change, {clock_updated, Clock}) ->
{clock_updated, #transfer_ClockChange{clock = marshal(clock, Clock)}};
marshal(transfer, #{final_cash_flow := Cashflow}) ->
marshal(transfer, Transfer) ->
#transfer_Transfer{
cashflow = ff_cash_flow_codec:marshal(final_cash_flow, Cashflow)
id = ff_codec:marshal(id, ff_postings_transfer:id(Transfer)),
cashflow = ff_cash_flow_codec:marshal(final_cash_flow, ff_postings_transfer:final_cash_flow(Transfer))
};
marshal(status, created) ->
@ -58,9 +59,10 @@ unmarshal(change, {status_changed, #transfer_StatusChange{status = Status}}) ->
unmarshal(change, {clock_updated, #transfer_ClockChange{clock = Clock}}) ->
{clock_updated, unmarshal(clock, Clock)};
unmarshal(transfer, #transfer_Transfer{cashflow = Cashflow}) ->
unmarshal(transfer, Transfer) ->
#{
final_cash_flow => ff_cash_flow_codec:unmarshal(final_cash_flow, Cashflow)
id => ff_codec:unmarshal(id, Transfer#transfer_Transfer.id),
final_cash_flow => ff_cash_flow_codec:unmarshal(final_cash_flow, Transfer#transfer_Transfer.cashflow)
};
unmarshal(account_type, CashflowAccount) ->

View File

@ -197,6 +197,7 @@ adjustment_codec_test() ->
},
Transfer = #{
id => genlib:unique(),
final_cash_flow => FinalCashFlow
},

View File

@ -201,6 +201,7 @@ adjustment_codec_test() ->
},
Transfer = #{
id => genlib:unique(),
final_cash_flow => FinalCashFlow
},

View File

@ -63,7 +63,7 @@
0},
{<<"fistful_proto">>,
{git,"git@github.com:rbkmoney/fistful-proto.git",
{ref,"8f2e52480fb32c4a91fb83a28bdc115ff06057bc"}},
{ref,"26deb9db1cda2ef8e931e3e5ceb959da64feeef1"}},
0},
{<<"fistful_reporter_proto">>,
{git,"git@github.com:rbkmoney/fistful-reporter-proto.git",