Rename mix-max-cost to max-cost-mixed (previous name was misleading)

Author: georgeee

orchestrator/.gitignore

@@ -3,10 +3,10 @@ bazel-*
 user.bazelrc
 
 # make stuff
-result/
-generator
-orchestrator
-orchestrator_service
+/result/
+/generator
+/orchestrator
+/orchestrator_service
 
 # Binaries for programs and plugins
 *.exe

orchestrator/src/generate.go

@@ -26,7 +26,7 @@ type GenParams struct {
 	RotationKeys, RotationServers                                        []string
 	RotationPermutation                                                  bool
 	RotationRatio                                                        float64
-	MixMaxCostTpsRatio                                                   float64
+	MaxCostMixedTpsRatio                                                 float64
 	LargePauseEveryNRounds, LargePauseMin                                int
 	MinBalanceChange, MaxBalanceChange, DeploymentFee                    uint64
 	PaymentAmount, MinZkappFee, MaxZkappFee, FundFee                     uint64
@@ -73,7 +73,7 @@ func DefaultGenParams() GenParams {
 		RotationServers:        []string{},
 		RotationPermutation:    false,
 		RotationRatio:          0.3,
-		MixMaxCostTpsRatio:     0.0,
+		MaxCostMixedTpsRatio:   0.0,
 		LargePauseEveryNRounds: 8,
 		LargePauseMin:          0,
 		MinBalanceChange:       0,
@@ -318,10 +318,10 @@ func (p *GenParams) Generate(round int) GeneratedRound {
 	tps := SampleTps(p.BaseTps, p.StressTps)
 	maxCost := p.MaxCost
 	zkappRatio := p.ZkappRatio
-	if p.MixMaxCostTpsRatio > 1e-3 && (round&1) == 1 {
+	if p.MaxCostMixedTpsRatio > 1e-3 && (round&1) == 1 {
 		maxCost = true
 		zkappRatio = 1
-		tps *= p.MixMaxCostTpsRatio
+		tps *= p.MaxCostMixedTpsRatio
 	}
 	experimentName := fmt.Sprintf("%s-%d", p.ExperimentName, round)
 	onlyZkapps := math.Abs(1-zkappRatio) < 1e-3

orchestrator/src/generate_test.go

@@ -26,7 +26,7 @@ func someParams() GenParams {
 		PaymentReceiver:        "B62qpPita1s7Dbnr7MVb3UK8fdssZixL1a4536aeMYxbTJEtRGGyS8U",
 		PrivkeysPerFundCmd:     2,
 		GenerateFundKeys:       20,
-		MixMaxCostTpsRatio:     0.7,
+		MaxCostMixedTpsRatio:   0.7,
 		LargePauseEveryNRounds: 8,
 		LargePauseMin:          240,
 		MinBalanceChange:       1e3,

orchestrator/src/generate_validation.go

@@ -41,12 +41,12 @@ func ValidationSteps(p *GenParams) []ValidationStep {
 		simpleRangeCheck(p.MinStopRatio, "min stop ratio"),
 		simpleRangeCheck(p.MaxStopRatio, "max stop ratio"),
 		simpleRangeCheck(p.StopCleanRatio, "stop-clean ratio"),
-		simpleRangeCheck(p.MixMaxCostTpsRatio, "max-cost-mixed ratio"),
+		simpleRangeCheck(p.MaxCostMixedTpsRatio, "max-cost-mixed ratio"),
 		simpleRangeCheck(p.RotationRatio, "rotation ratio"),
 		{
 			ErrorMsg: "both max-cost-mixed and max-cost specified",
 			Check: func(p *GenParams) bool {
-				return p.MaxCost && p.MixMaxCostTpsRatio > 1e-3
+				return p.MaxCost && p.MaxCostMixedTpsRatio > 1e-3
 			},
 			ExitCode: 2,
 		},

orchestrator/src/generator/main.go

@@ -10,7 +10,7 @@ import (
 	lib "itn_orchestrator"
 )
 
-const mixMaxCostTpsRatioHelp = "when provided, specifies ratio of tps (proportional to total tps) for max cost transactions to be used every other round, zkapps ratio for these rounds is set to 100%"
+const maxCostMixedTpsRatioHelp = "when provided, specifies ratio of tps (proportional to total tps) for max cost transactions to be used every other round, zkapps ratio for these rounds is set to 100%"
 
 func main() {
 	var rotateKeys, rotateServers string
@@ -50,7 +50,7 @@ func main() {
 	flag.BoolVar(&p.RotationPermutation, "rotate-permutation", defaults.RotationPermutation, "Whether to generate only permutation mappings for rotation")
 	flag.IntVar(&p.LargePauseMin, "large-pause", defaults.LargePauseMin, "duration of the large pause, minutes")
 	flag.IntVar(&p.LargePauseEveryNRounds, "large-pause-every", defaults.LargePauseEveryNRounds, "number of rounds in between large pauses")
-	flag.Float64Var(&p.MixMaxCostTpsRatio, "max-cost-mixed", defaults.MixMaxCostTpsRatio, mixMaxCostTpsRatioHelp)
+	flag.Float64Var(&p.MaxCostMixedTpsRatio, "max-cost-mixed", defaults.MaxCostMixedTpsRatio, maxCostMixedTpsRatioHelp)
 	flag.Uint64Var(&p.MaxBalanceChange, "max-balance-change", defaults.MaxBalanceChange, "Max balance change for zkapp account update")
 	flag.Uint64Var(&p.MinBalanceChange, "min-balance-change", defaults.MinBalanceChange, "Min balance change for zkapp account update")
 	flag.Uint64Var(&p.DeploymentFee, "deployment-fee", defaults.DeploymentFee, "Zkapp deployment fee")

orchestrator/src/service/inputs/generator.go

@@ -11,7 +11,7 @@ type GeneratorInputData struct {
 	BaseTps                *float64                      `json:"base_tps,omitempty"`
 	StressTps              *float64                      `json:"stress_tps,omitempty"`
 	MinTps                 *float64                      `json:"min_tps,omitempty"`
-	MixMaxCostTpsRatio     *float64                      `json:"mix_max_cost_tps_ratio,omitempty"`
+	MaxCostMixedTpsRatio   *float64                      `json:"max_cost_mixed_tps_ratio,omitempty"`
 	MinStopRatio           *float64                      `json:"min_stop_ratio,omitempty"`
 	MaxStopRatio           *float64                      `json:"max_stop_ratio,omitempty"`
 	SenderRatio            *float64                      `json:"sender_ratio,omitempty"`
@@ -54,8 +54,6 @@ type GeneratorInputData struct {
 	} `json:"fees,omitempty"`
 }
 
-const mixMaxCostTpsRatioHelp = "when provided, specifies ratio of tps (proportional to total tps) for max cost transactions to be used every other round, zkapps ratio for these rounds is set to 100%"
-
 func (inputData *GeneratorInputData) ApplyWithDefaults(p *lib.GenParams) {
 
 	var defaults = lib.DefaultGenParams()
@@ -66,7 +64,7 @@ func (inputData *GeneratorInputData) ApplyWithDefaults(p *lib.GenParams) {
 	lib.SetOrDefault(inputData.BaseTps, &p.BaseTps, defaults.BaseTps)
 	lib.SetOrDefault(inputData.StressTps, &p.StressTps, defaults.StressTps)
 	lib.SetOrDefault(inputData.MinTps, &p.MinTps, defaults.MinTps)
-	lib.SetOrDefault(inputData.MixMaxCostTpsRatio, &p.MixMaxCostTpsRatio, defaults.MixMaxCostTpsRatio)
+	lib.SetOrDefault(inputData.MaxCostMixedTpsRatio, &p.MaxCostMixedTpsRatio, defaults.MaxCostMixedTpsRatio)
 	lib.SetOrDefault(inputData.MinStopRatio, &p.MinStopRatio, defaults.MinStopRatio)
 	lib.SetOrDefault(inputData.MaxStopRatio, &p.MaxStopRatio, defaults.MaxStopRatio)
 	lib.SetOrDefault(inputData.SenderRatio, &p.SenderRatio, defaults.SenderRatio)