TD-266: Drop valitydev/payout-manager-proto dep altogether (#25)

Unqualified include `proto/domain.thrift` is ambiguous. There's
`domain.thrift` both in damsel and payout-manager-proto. Ideally we need
qualified include (e.g. `include "payout-manager-proto/proto/domain.thrift"`)
but in the meantime dropping dependency will suffice, there was just a
single typedef reference anyway.
This commit is contained in:
Andrew Mayorov 2022-05-23 13:37:45 +03:00 committed by GitHub
parent ba389d1f95
commit bbda159d31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 19 deletions

View File

@ -63,12 +63,6 @@
<version>1.551-df1c52f</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
<artifactId>payout-manager-proto</artifactId>
<version>1.27-1fac5a3</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>

View File

@ -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<PayoutStatusType> 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

View File

@ -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}}
]}
]}.