diff --git a/pom.xml b/pom.xml index 03a1be0..9a2781b 100644 --- a/pom.xml +++ b/pom.xml @@ -63,12 +63,6 @@ 1.551-df1c52f provided - - dev.vality - payout-manager-proto - 1.27-1fac5a3 - provided - diff --git a/proto/magista.thrift b/proto/magista.thrift index 7e27713..f6ad56b 100644 --- a/proto/magista.thrift +++ b/proto/magista.thrift @@ -1,10 +1,12 @@ include "proto/base.thrift" include "proto/domain.thrift" -include "proto/payout_manager.thrift" namespace java dev.vality.magista namespace erlang magista +// See https://github.com/valitydev/payout-manager-proto/blob/063163dc/proto/payout_manager.thrift#L7 +typedef base.ID PayoutID + typedef string ContinuationToken exception BadContinuationToken { 1: string reason } @@ -48,7 +50,7 @@ struct ChargebackSearchQuery { struct PayoutSearchQuery { 1: required CommonSearchQueryParams common_search_query_params - 2: optional payout_manager.PayoutID payout_id + 2: optional PayoutID payout_id 3: optional list payout_status_types 4: optional PayoutToolType payout_type } @@ -250,8 +252,6 @@ struct StatCustomer { 2: required base.Timestamp created_at } -typedef base.ID PayoutID - struct StatPayout { 1: required PayoutID id 2: required domain.PartyID party_id diff --git a/rebar.config b/rebar.config index 196e082..95c900f 100644 --- a/rebar.config +++ b/rebar.config @@ -29,10 +29,6 @@ {damsel, {git, "https://github.com/valitydev/damsel.git", {branch, "master"}} - }, - {payout_manager_proto, - {git, "https://github.com/valitydev/payout-manager-proto.git", - {branch, "master"}} } ]}. @@ -67,7 +63,7 @@ {provider_hooks, [ {pre, [ {compile, {thrift, compile}}, - {clean , {thrift, clean }} + {clean, {thrift, clean}} ]} ]}. diff --git a/rebar.lock b/rebar.lock index 414db31..8a22bc6 100644 --- a/rebar.lock +++ b/rebar.lock @@ -2,7 +2,7 @@ {git,"https://github.com/valitydev/damsel.git", {ref,"df1c52f2ebe175fabe1da4aec8ac889b2dd03a0b"}}, 0}, - {<<"payout_manager_proto">>, - {git,"https://github.com/valitydev/payout-manager-proto.git", - {ref,"1fac5a36c6b315625e77509371a44ebe543c96df"}}, - 0}]. + {<<"payout_manager_proto">>, + {git,"https://github.com/valitydev/payout-manager-proto.git", + {ref,"1fac5a36c6b315625e77509371a44ebe543c96df"}}, + 0}].