Skip to content

Commit fdaa144

Browse files
authored
Rename proto fields to be a bit more clear (#3112) (#3178)
1 parent 2bca3bc commit fdaa144

File tree

5 files changed

+102
-94
lines changed

5 files changed

+102
-94
lines changed

indexer/packages/v4-protos/src/codegen/dydxprotocol/affiliates/affiliates.ts

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -77,32 +77,38 @@ export interface AffiliateWhitelist_TierSDKType {
7777
/** AffiliateParameters defines the parameters for the affiliate program. */
7878

7979
export interface AffiliateParameters {
80-
/** Maximum commission per referred user in a 30d rolling window in revenue */
81-
maximum_30dCommissionPerReferredQuoteQuantums: Long;
82-
/** Referee minimum fee tier index */
80+
/**
81+
* Maximum attributable volume for a referred user in a 30d rolling window in
82+
* notional
83+
*/
84+
maximum_30dAttributableVolumePerReferredUserNotional: Long;
85+
/** Referred user automatically gets set to this fee tier */
8386

8487
refereeMinimumFeeTierIdx: number;
8588
/**
86-
* Maximum attributable revenue per affiliate in a 30d rolling window in
87-
* revenue
89+
* Maximum attributable revenue for a referred user in a 30d rolling window in
90+
* quote quantums
8891
*/
8992

90-
maximum_30dAttributableRevenuePerAffiliateQuoteQuantums: Long;
93+
maximum_30dAttributableRevenuePerReferredUserQuoteQuantums: Long;
9194
}
9295
/** AffiliateParameters defines the parameters for the affiliate program. */
9396

9497
export interface AffiliateParametersSDKType {
95-
/** Maximum commission per referred user in a 30d rolling window in revenue */
96-
maximum_30d_commission_per_referred_quote_quantums: Long;
97-
/** Referee minimum fee tier index */
98+
/**
99+
* Maximum attributable volume for a referred user in a 30d rolling window in
100+
* notional
101+
*/
102+
maximum_30d_attributable_volume_per_referred_user_notional: Long;
103+
/** Referred user automatically gets set to this fee tier */
98104

99105
referee_minimum_fee_tier_idx: number;
100106
/**
101-
* Maximum attributable revenue per affiliate in a 30d rolling window in
102-
* revenue
107+
* Maximum attributable revenue for a referred user in a 30d rolling window in
108+
* quote quantums
103109
*/
104110

105-
maximum_30d_attributable_revenue_per_affiliate_quote_quantums: Long;
111+
maximum_30d_attributable_revenue_per_referred_user_quote_quantums: Long;
106112
}
107113
/** AffiliateOverrides defines the affiliate whitelist. */
108114

@@ -335,24 +341,24 @@ export const AffiliateWhitelist_Tier = {
335341

336342
function createBaseAffiliateParameters(): AffiliateParameters {
337343
return {
338-
maximum_30dCommissionPerReferredQuoteQuantums: Long.UZERO,
344+
maximum_30dAttributableVolumePerReferredUserNotional: Long.UZERO,
339345
refereeMinimumFeeTierIdx: 0,
340-
maximum_30dAttributableRevenuePerAffiliateQuoteQuantums: Long.UZERO
346+
maximum_30dAttributableRevenuePerReferredUserQuoteQuantums: Long.UZERO
341347
};
342348
}
343349

344350
export const AffiliateParameters = {
345351
encode(message: AffiliateParameters, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
346-
if (!message.maximum_30dCommissionPerReferredQuoteQuantums.isZero()) {
347-
writer.uint32(8).uint64(message.maximum_30dCommissionPerReferredQuoteQuantums);
352+
if (!message.maximum_30dAttributableVolumePerReferredUserNotional.isZero()) {
353+
writer.uint32(8).uint64(message.maximum_30dAttributableVolumePerReferredUserNotional);
348354
}
349355

350356
if (message.refereeMinimumFeeTierIdx !== 0) {
351357
writer.uint32(16).uint32(message.refereeMinimumFeeTierIdx);
352358
}
353359

354-
if (!message.maximum_30dAttributableRevenuePerAffiliateQuoteQuantums.isZero()) {
355-
writer.uint32(24).uint64(message.maximum_30dAttributableRevenuePerAffiliateQuoteQuantums);
360+
if (!message.maximum_30dAttributableRevenuePerReferredUserQuoteQuantums.isZero()) {
361+
writer.uint32(24).uint64(message.maximum_30dAttributableRevenuePerReferredUserQuoteQuantums);
356362
}
357363

358364
return writer;
@@ -368,15 +374,15 @@ export const AffiliateParameters = {
368374

369375
switch (tag >>> 3) {
370376
case 1:
371-
message.maximum_30dCommissionPerReferredQuoteQuantums = (reader.uint64() as Long);
377+
message.maximum_30dAttributableVolumePerReferredUserNotional = (reader.uint64() as Long);
372378
break;
373379

374380
case 2:
375381
message.refereeMinimumFeeTierIdx = reader.uint32();
376382
break;
377383

378384
case 3:
379-
message.maximum_30dAttributableRevenuePerAffiliateQuoteQuantums = (reader.uint64() as Long);
385+
message.maximum_30dAttributableRevenuePerReferredUserQuoteQuantums = (reader.uint64() as Long);
380386
break;
381387

382388
default:
@@ -390,9 +396,9 @@ export const AffiliateParameters = {
390396

391397
fromPartial(object: DeepPartial<AffiliateParameters>): AffiliateParameters {
392398
const message = createBaseAffiliateParameters();
393-
message.maximum_30dCommissionPerReferredQuoteQuantums = object.maximum_30dCommissionPerReferredQuoteQuantums !== undefined && object.maximum_30dCommissionPerReferredQuoteQuantums !== null ? Long.fromValue(object.maximum_30dCommissionPerReferredQuoteQuantums) : Long.UZERO;
399+
message.maximum_30dAttributableVolumePerReferredUserNotional = object.maximum_30dAttributableVolumePerReferredUserNotional !== undefined && object.maximum_30dAttributableVolumePerReferredUserNotional !== null ? Long.fromValue(object.maximum_30dAttributableVolumePerReferredUserNotional) : Long.UZERO;
394400
message.refereeMinimumFeeTierIdx = object.refereeMinimumFeeTierIdx ?? 0;
395-
message.maximum_30dAttributableRevenuePerAffiliateQuoteQuantums = object.maximum_30dAttributableRevenuePerAffiliateQuoteQuantums !== undefined && object.maximum_30dAttributableRevenuePerAffiliateQuoteQuantums !== null ? Long.fromValue(object.maximum_30dAttributableRevenuePerAffiliateQuoteQuantums) : Long.UZERO;
401+
message.maximum_30dAttributableRevenuePerReferredUserQuoteQuantums = object.maximum_30dAttributableRevenuePerReferredUserQuoteQuantums !== undefined && object.maximum_30dAttributableRevenuePerReferredUserQuoteQuantums !== null ? Long.fromValue(object.maximum_30dAttributableRevenuePerReferredUserQuoteQuantums) : Long.UZERO;
396402
return message;
397403
}
398404

proto/dydxprotocol/affiliates/affiliates.proto

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,16 @@ message AffiliateWhitelist {
3838

3939
// AffiliateParameters defines the parameters for the affiliate program.
4040
message AffiliateParameters {
41-
// Maximum commission per referred user in a 30d rolling window in revenue
42-
uint64 maximum_30d_commission_per_referred_quote_quantums = 1;
41+
// Maximum attributable volume for a referred user in a 30d rolling window in
42+
// notional
43+
uint64 maximum_30d_attributable_volume_per_referred_user_notional = 1;
4344

44-
// Referee minimum fee tier index
45+
// Referred user automatically gets set to this fee tier
4546
uint32 referee_minimum_fee_tier_idx = 2;
4647

47-
// Maximum attributable revenue per affiliate in a 30d rolling window in
48-
// revenue
49-
uint64 maximum_30d_attributable_revenue_per_affiliate_quote_quantums = 3;
48+
// Maximum attributable revenue for a referred user in a 30d rolling window in
49+
// quote quantums
50+
uint64 maximum_30d_attributable_revenue_per_referred_user_quote_quantums = 3;
5051
}
5152

5253
// AffiliateOverrides defines the affiliate whitelist.

protocol/x/affiliates/keeper/keeper_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -861,9 +861,9 @@ func TestUpdateAffiliateParameters(t *testing.T) {
861861

862862
affiliateParameters, err := k.GetAffiliateParameters(ctx)
863863
require.NoError(t, err)
864-
require.Equal(t, uint64(100), affiliateParameters.GetMaximum_30DAttributableRevenuePerAffiliateQuoteQuantums())
864+
require.Equal(t, uint64(100), affiliateParameters.GetMaximum_30DAttributableVolumePerReferredUserNotional())
865865
require.Equal(t, uint32(1), affiliateParameters.GetRefereeMinimumFeeTierIdx())
866-
require.Equal(t, uint64(100), affiliateParameters.GetMaximum_30DCommissionPerReferredQuoteQuantums())
866+
require.Equal(t, uint64(100), affiliateParameters.GetMaximum_30DAttributableRevenuePerReferredUserQuoteQuantums())
867867
}
868868

869869
func TestGetTierForAffiliateOverrides(t *testing.T) {

0 commit comments

Comments
 (0)