Update loops and config field

Author: friedemannf

framework/components/blockchain/blockchain.go

@@ -63,7 +63,7 @@ type Input struct {
 	FaucetPort string `toml:"faucet_port"`
 
 	// Canton specific
-	NumberOfValidators int `toml:"number_of_validators"`
+	NumberOfCantonValidators int `toml:"number_of_canton_validators"`
 
 	// GAPv2 specific params
 	HostNetworkMode  bool   `toml:"host_network_mode"`

framework/components/blockchain/canton.go

@@ -11,8 +11,8 @@ import (
 )
 
 func newCanton(ctx context.Context, in *Input) (*Output, error) {
-	if in.NumberOfValidators >= 100 {
-		return nil, fmt.Errorf("number of validators too high: %d, max is 99", in.NumberOfValidators)
+	if in.NumberOfCantonValidators >= 100 {
+		return nil, fmt.Errorf("number of validators too high: %d, max is 99", in.NumberOfCantonValidators)
 	}
 
 	// TODO - remove debug prints
@@ -25,7 +25,7 @@ func newCanton(ctx context.Context, in *Input) (*Output, error) {
 	fmt.Println("Network created:", dockerNetwork.Name)
 
 	// Set up Postgres container
-	postgresReq := canton.PostgresContainerRequest(in.NumberOfValidators, dockerNetwork.Name)
+	postgresReq := canton.PostgresContainerRequest(in.NumberOfCantonValidators, dockerNetwork.Name)
 	fmt.Printf("Starting postgres container %s...\n", postgresReq.Name)
 	c, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 		ContainerRequest: postgresReq,
@@ -38,7 +38,7 @@ func newCanton(ctx context.Context, in *Input) (*Output, error) {
 	fmt.Println("Postgres container started")
 
 	// Set up Canton container
-	cantonReq := canton.CantonContainerRequest(dockerNetwork.Name, in.NumberOfValidators, in.Image)
+	cantonReq := canton.CantonContainerRequest(dockerNetwork.Name, in.NumberOfCantonValidators, in.Image)
 	fmt.Printf("Starting canton container %s...\n", cantonReq.Name)
 	cantonContainer, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 		ContainerRequest: cantonReq,
@@ -51,7 +51,7 @@ func newCanton(ctx context.Context, in *Input) (*Output, error) {
 	fmt.Println("Canton container started")
 
 	// Set up Splice container
-	spliceReq := canton.SpliceContainerRequest(dockerNetwork.Name, in.NumberOfValidators, in.Image)
+	spliceReq := canton.SpliceContainerRequest(dockerNetwork.Name, in.NumberOfCantonValidators, in.Image)
 	fmt.Printf("Starting splice container %s...\n", spliceReq.Name)
 	spliceContainer, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 		ContainerRequest: spliceReq,
@@ -64,7 +64,7 @@ func newCanton(ctx context.Context, in *Input) (*Output, error) {
 	fmt.Println("Splice container started")
 
 	// Set up Nginx container
-	nginxReq := canton.NginxContainerRequest(dockerNetwork.Name, in.NumberOfValidators, in.Port)
+	nginxReq := canton.NginxContainerRequest(dockerNetwork.Name, in.NumberOfCantonValidators, in.Port)
 	fmt.Printf("Starting nginx container %s...\n", nginxReq.Name)
 	nginxContainer, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 		ContainerRequest: nginxReq,

framework/components/blockchain/canton/canton.go

@@ -46,8 +46,7 @@ grpcurl -plaintext "localhost:${CANTON_PARTICIPANT_GRPC_HEALTHCHECK_PORT_PREFIX}
 
 	`
 	// Add additional participants
-	for i := range numberOfValidators {
-		i += 1 // start from 1 since SV is 0
+	for i := 1; i <= numberOfValidators; i++ {
 		script += fmt.Sprintf(`
 # Participant %02[1]d
 echo "Checking ${CANTON_PARTICIPANT_GRPC_HEALTHCHECK_PORT_PREFIX}%02[1]d"
@@ -280,8 +279,7 @@ canton.participants.sv = ${_participant} {
 	`
 
 	// Add additional participants
-	for i := range numberOfValidators {
-		i += 1 // start from 1 since SV is 0
+	for i := 1; i <= numberOfValidators; i++ {
 		config += fmt.Sprintf(`
 # Participant %02[1]d
 canton.participants.participant%[1]d = ${_participant} {

framework/components/blockchain/canton/nginx.go

@@ -114,8 +114,7 @@ server {
 	`
 
 	// Add additional validators
-	for i := range numberOfValidators {
-		i += 1 // start from 1 since SV is 0
+	for i := 1; i <= numberOfValidators; i++ {
 		template += fmt.Sprintf(`
 # Participant %[1]d
 	server {

framework/components/blockchain/canton/splice.go

@@ -29,8 +29,7 @@ curl -f http://localhost:5014/api/sv/readyz
 # SV
 curl -f "http://localhost:${SPLICE_VALIDATOR_ADMIN_API_PORT_PREFIX}00/api/validator/readyz"
 `
-	for i := range numberOfValidators {
-		i += 1 // start from 1 since SV is 0
+	for i := 1; i <= numberOfValidators; i++ {
 		script += fmt.Sprintf(`
 # Participant %02[1]d
 curl -f "http://localhost:${SPLICE_VALIDATOR_ADMIN_API_PORT_PREFIX}%02[1]d/api/validator/readyz"
@@ -275,8 +274,7 @@ canton.validator-apps.sv-validator_backend = ${_validator_backend} {
 
 `
 	// Add additional participants
-	for i := range numberOfValidators {
-		i += 1 // start from 1 since SV is 0
+	for i := 1; i <= numberOfValidators; i++ {
 		config += fmt.Sprintf(`
 # Participant %02[1]d
 canton.validator-apps.participant%[1]d-validator_backend = ${_validator_backend} {