fix: ensure tiers are set by core, fix gqlgen for yaml linter

Signed-off-by: Elias Van Ootegem <elias@vega.xyz>
vegaprotocol · Aug 20, 2024 · a59c294 · a59c294
1 parent 6803e6a
commit a59c294
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/core/types/rebate_program.go b/core/types/rebate_program.go
@@ -20,6 +20,7 @@ import (
 	"time"
 
 	"code.vegaprotocol.io/vega/libs/num"
+	"code.vegaprotocol.io/vega/libs/ptr"
 	vegapb "code.vegaprotocol.io/vega/protos/vega"
 )
 
@@ -42,10 +43,11 @@ type VolumeRebateBenefitTier struct {
 
 func (v VolumeRebateProgram) IntoProto() *vegapb.VolumeRebateProgram {
 	benefitTiers := make([]*vegapb.VolumeRebateBenefitTier, 0, len(v.VolumeRebateBenefitTiers))
-	for _, tier := range v.VolumeRebateBenefitTiers {
+	for i, tier := range v.VolumeRebateBenefitTiers {
 		benefitTiers = append(benefitTiers, &vegapb.VolumeRebateBenefitTier{
 			MinimumPartyMakerVolumeFraction: tier.MinimumPartyMakerVolumeFraction.String(),
 			AdditionalMakerRebate:           tier.AdditionalMakerRebate.String(),
+			TierNumber:                      ptr.From(uint64(i + 1)),
 		})
 	}
 

diff --git a/core/types/referral_program.go b/core/types/referral_program.go
@@ -20,6 +20,7 @@ import (
 	"time"
 
 	"code.vegaprotocol.io/vega/libs/num"
+	"code.vegaprotocol.io/vega/libs/ptr"
 	vegapb "code.vegaprotocol.io/vega/protos/vega"
 )
 
@@ -172,12 +173,13 @@ func (c ReferralProgram) String() string {
 
 func (c ReferralProgram) IntoProto() *vegapb.ReferralProgram {
 	benefitTiers := make([]*vegapb.BenefitTier, 0, len(c.BenefitTiers))
-	for _, tier := range c.BenefitTiers {
+	for i, tier := range c.BenefitTiers {
 		benefitTiers = append(benefitTiers, &vegapb.BenefitTier{
 			MinimumEpochs:                     tier.MinimumEpochs.String(),
 			MinimumRunningNotionalTakerVolume: tier.MinimumRunningNotionalTakerVolume.String(),
 			ReferralRewardFactors:             tier.ReferralRewardFactors.IntoRewardFactorsProto(),
 			ReferralDiscountFactors:           tier.ReferralDiscountFactors.IntoDiscountFactorsProto(),
+			TierNumber:                        ptr.From(uint64(i + 1)),
 		})
 	}
 

diff --git a/core/types/volume_discount_program.go b/core/types/volume_discount_program.go
@@ -20,6 +20,7 @@ import (
 	"time"
 
 	"code.vegaprotocol.io/vega/libs/num"
+	"code.vegaprotocol.io/vega/libs/ptr"
 	vegapb "code.vegaprotocol.io/vega/protos/vega"
 )
 
@@ -42,10 +43,11 @@ type VolumeBenefitTier struct {
 
 func (v VolumeDiscountProgram) IntoProto() *vegapb.VolumeDiscountProgram {
 	benefitTiers := make([]*vegapb.VolumeBenefitTier, 0, len(v.VolumeBenefitTiers))
-	for _, tier := range v.VolumeBenefitTiers {
+	for i, tier := range v.VolumeBenefitTiers {
 		benefitTiers = append(benefitTiers, &vegapb.VolumeBenefitTier{
 			MinimumRunningNotionalTakerVolume: tier.MinimumRunningNotionalTakerVolume.String(),
 			VolumeDiscountFactors:             tier.VolumeDiscountFactors.IntoDiscountFactorsProto(),
+			TierNumber:                        ptr.From(uint64(i + 1)),
 		})
 	}
 

diff --git a/datanode/gateway/graphql/gqlgen.yml b/datanode/gateway/graphql/gqlgen.yml
@@ -848,4 +848,3 @@ models:
     model: code.vegaprotocol.io/vega/protos/data-node/api/v2.GetPartyDiscountStatsResponse
   MarketFees:
     model: code.vegaprotocol.io/vega/protos/data-node/api/v2.MarketFees
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -848,4 +848,3 @@ models:
		model: code.vegaprotocol.io/vega/protos/data-node/api/v2.GetPartyDiscountStatsResponse
		MarketFees:
		model: code.vegaprotocol.io/vega/protos/data-node/api/v2.MarketFees