CNS-815: fixed all plan related code + fix plan proposal

ebaeba0 · Jan 15, 2024 · 88bbddd · 88bbddd
1 parent 3e41081
commit 88bbddd
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 9 deletions.
diff --git a/testutil/common/mock.go b/testutil/common/mock.go
@@ -34,6 +34,7 @@ func CreateMockPlan() plantypes.Plan {
 		OveruseRate:              10,
 		AnnualDiscountPercentage: 20,
 		PlanPolicy:               CreateMockPolicy(),
+		Projects:                 10,
 	}
 
 	return plan

diff --git a/x/pairing/keeper/pairing_test.go b/x/pairing/keeper/pairing_test.go
@@ -982,20 +982,23 @@ func TestGeolocationPairingScores(t *testing.T) {
 		Index:      "free",
 		Block:      ts.BlockHeight(),
 		Price:      sdk.NewCoin(ts.TokenDenom(), sdk.NewInt(1)),
+		Projects:   3,
 		PlanPolicy: freePlanPolicy,
 	}
 
 	basicPlan := planstypes.Plan{
 		Index:      "basic",
 		Block:      ts.BlockHeight(),
 		Price:      sdk.NewCoin(ts.TokenDenom(), sdk.NewInt(1)),
+		Projects:   5,
 		PlanPolicy: basicPlanPolicy,
 	}
 
 	premiumPlan := planstypes.Plan{
 		Index:      "premium",
 		Block:      ts.BlockHeight(),
 		Price:      sdk.NewCoin(ts.TokenDenom(), sdk.NewInt(1)),
+		Projects:   7,
 		PlanPolicy: premiumPlanPolicy,
 	}
 
@@ -1196,6 +1199,7 @@ func TestDuplicateProviders(t *testing.T) {
 		Index:      "basic",
 		Block:      ts.BlockHeight(),
 		Price:      sdk.NewCoin(ts.TokenDenom(), sdk.NewInt(1)),
+		Projects:   5,
 		PlanPolicy: basicPlanPolicy,
 	}
 
@@ -1247,6 +1251,7 @@ func TestNoRequiredGeo(t *testing.T) {
 		Index:      "free",
 		Block:      ts.BlockHeight(),
 		Price:      sdk.NewCoin(ts.TokenDenom(), sdk.NewInt(1)),
+		Projects:   3,
 		PlanPolicy: freePlanPolicy,
 	}
 

diff --git a/x/plans/keeper/plan_test.go b/x/plans/keeper/plan_test.go
@@ -62,6 +62,7 @@ func (ts *tester) createTestPlans(count int, withSameIndex bool, startIndex int)
 			AllowOveruse:             true,
 			OveruseRate:              overuseRate,
 			AnnualDiscountPercentage: 20,
+			Projects:                 10,
 		}
 
 		plans = append(plans, plan)

diff --git a/x/plans/types/errors.go b/x/plans/types/errors.go
@@ -26,4 +26,5 @@ var (
 	ErrPolicyInvalidSelectedProvidersConfig = sdkerrors.Register(ModuleName, 15, "plan's selected providers config is invalid")
 	ErrPolicyGeolocation                    = sdkerrors.Register(ModuleName, 16, "plan's geolocation is invalid")
 	ErrInvalidDenom                         = sdkerrors.Register(ModuleName, 17, commontypes.ErrInvalidDenomMsg)
+	ErrInvalidPlanProjects                  = sdkerrors.Register(ModuleName, 18, "plan's projects field is invalid")
 )
diff --git a/x/plans/types/plan.go b/x/plans/types/plan.go
@@ -45,6 +45,10 @@ func (p Plan) ValidatePlan() error {
 		return sdkerrors.Wrap(ErrInvalidPlanAnnualDiscount, "plan's annual discount is invalid (not between 0-100 percent)")
 	}
 
+	if p.GetProjects() == 0 {
+		return sdkerrors.Wrap(ErrInvalidPlanProjects, "plan's projects field must be a non-zero positive integer")
+	}
+
 	err := p.PlanPolicy.ValidateBasicPolicy(true)
 	if err != nil {
 		return err

diff --git a/x/plans/types/plan_decode_test.go b/x/plans/types/plan_decode_test.go
@@ -60,6 +60,7 @@ func TestDecodeJsonPlan(t *testing.T) {
 		AnnualDiscountPercentage: 20,
 		AllowOveruse:             true,
 		OveruseRate:              2,
+		Projects:                 10,
 		PlanPolicy: Policy{
 			ChainPolicies: []ChainPolicy{
 				{ChainId: "LAV1", Apis: []string{}},
@@ -84,6 +85,7 @@ func TestDecodeJsonPlan(t *testing.T) {
         "annual_discount_percentage": 20,
         "allow_overuse": true,
         "overuse_rate": 2,
+		"projects": 10,
         "plan_policy": {
             "chain_policies": [
                 {
@@ -135,6 +137,7 @@ func TestDecodePlanAddProposal(t *testing.T) {
 				AnnualDiscountPercentage: 20,
 				AllowOveruse:             true,
 				OveruseRate:              2,
+				Projects:                 10,
 				PlanPolicy: Policy{
 					ChainPolicies: []ChainPolicy{
 						{ChainId: "LAV1", Apis: []string{}},
@@ -156,6 +159,7 @@ func TestDecodePlanAddProposal(t *testing.T) {
 				AnnualDiscountPercentage: 20,
 				AllowOveruse:             true,
 				OveruseRate:              2,
+				Projects:                 5,
 				PlanPolicy: Policy{
 					ChainPolicies: []ChainPolicy{
 						{ChainId: "LAV1", Apis: []string{}},
@@ -191,6 +195,7 @@ func TestDecodePlanAddProposal(t *testing.T) {
 					"annual_discount_percentage": 20,
 					"allow_overuse": true,
 					"overuse_rate": 2,
+					"projects": 10,
 					"plan_policy": {
 						"chain_policies": [
 							{
@@ -229,6 +234,7 @@ func TestDecodePlanAddProposal(t *testing.T) {
 					"annual_discount_percentage": 20,
 					"allow_overuse": true,
 					"overuse_rate": 2,
+					"projects": 5,
 					"plan_policy": {
 						"chain_policies": [
 							{

diff --git a/x/projects/keeper/project_test.go b/x/projects/keeper/project_test.go
@@ -1096,9 +1096,10 @@ func TestSetPolicyByGeolocation(t *testing.T) {
 
 	// propose all plans
 	freePlan := planstypes.Plan{
-		Index: "free",
-		Block: uint64(ctx.BlockHeight()),
-		Price: sdk.NewCoin(keepers.StakingKeeper.BondDenom(ctx), sdk.NewInt(1)),
+		Index:    "free",
+		Block:    uint64(ctx.BlockHeight()),
+		Price:    sdk.NewCoin(keepers.StakingKeeper.BondDenom(ctx), sdk.NewInt(1)),
+		Projects: 3,
 		PlanPolicy: planstypes.Policy{
 			GeolocationProfile: 4, // USE
 			TotalCuLimit:       10,
@@ -1108,9 +1109,10 @@ func TestSetPolicyByGeolocation(t *testing.T) {
 	}
 
 	basicPlan := planstypes.Plan{
-		Index: "basic",
-		Block: uint64(ctx.BlockHeight()),
-		Price: sdk.NewCoin(keepers.StakingKeeper.BondDenom(ctx), sdk.NewInt(1)),
+		Index:    "basic",
+		Block:    uint64(ctx.BlockHeight()),
+		Price:    sdk.NewCoin(keepers.StakingKeeper.BondDenom(ctx), sdk.NewInt(1)),
+		Projects: 5,
 		PlanPolicy: planstypes.Policy{
 			GeolocationProfile: 0, // GLS
 			TotalCuLimit:       10,
@@ -1120,9 +1122,10 @@ func TestSetPolicyByGeolocation(t *testing.T) {
 	}
 
 	premiumPlan := planstypes.Plan{
-		Index: "premium",
-		Block: uint64(ctx.BlockHeight()),
-		Price: sdk.NewCoin(keepers.StakingKeeper.BondDenom(ctx), sdk.NewInt(1)),
+		Index:    "premium",
+		Block:    uint64(ctx.BlockHeight()),
+		Price:    sdk.NewCoin(keepers.StakingKeeper.BondDenom(ctx), sdk.NewInt(1)),
+		Projects: 10,
 		PlanPolicy: planstypes.Policy{
 			GeolocationProfile: 65535, // GL
 			TotalCuLimit:       10,