chore: use correct block height

Author: chatton

apps/loadgen/cmd/flags_test.go

@@ -0,0 +1,31 @@
+package cmd
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestStartFlags(t *testing.T) {
+	root := NewRootCmd()
+	startCmd := newStartCmd()
+	root.AddCommand(startCmd)
+
+	err := startCmd.ParseFlags([]string{"--regular-matrix", "custom.json"})
+	require.NoError(t, err)
+
+	// Since we can't easily access the cfg inside newStartCmd's closure from here
+	// without refactoring, we'll check if the flag is registered correctly.
+	flag := startCmd.Flags().Lookup("regular-matrix")
+	require.NotNil(t, flag)
+	require.Equal(t, "custom.json", flag.Value.String())
+}
+
+func TestRunArgs(t *testing.T) {
+	runCmd := newRunCmd()
+	err := runCmd.Args(runCmd, []string{"matrix.json"})
+	require.NoError(t, err)
+
+	err = runCmd.Args(runCmd, []string{})
+	require.Error(t, err)
+}

apps/loadgen/internal/client.go

@@ -1,6 +1,12 @@
 package internal
 
 import (
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"time"
+
 	dto "github.com/prometheus/client_model/go"
 
 	"github.com/celestiaorg/tastora/framework/docker/evstack/spamoor"
@@ -18,12 +24,16 @@ type SpamoorClient interface {
 }
 
 type spamoorAPIClient struct {
-	api *spamoor.API
+	api    *spamoor.API
+	client *http.Client
 }
 
 // NewSpamoorClient creates a SpamoorClient backed by the real spamoor HTTP API.
 func NewSpamoorClient(baseURL string) SpamoorClient {
-	return spamoorAPIClient{api: spamoor.NewAPI(baseURL)}
+	return spamoorAPIClient{
+		api:    spamoor.NewAPI(baseURL),
+		client: &http.Client{Timeout: 2 * time.Second},
+	}
 }
 
 func (c spamoorAPIClient) URL() string { return c.api.BaseURL }
@@ -42,4 +52,43 @@ func (c spamoorAPIClient) GetMetrics() (map[string]*dto.MetricFamily, error) {
 	return c.api.GetMetrics()
 }
 
-func (c spamoorAPIClient) GetClients() ([]spamoor.Client, error) { return c.api.GetClients() }
+// clientResponse matches the actual spamoor daemon JSON response where
+// the block height field is "block_height".
+type clientResponse struct {
+	Index       int      `json:"index"`
+	Name        string   `json:"name"`
+	URL         string   `json:"url"`
+	Groups      []string `json:"groups"`
+	Enabled     bool     `json:"enabled"`
+	BlockHeight uint64   `json:"block_height"`
+}
+
+// GetClients fetches clients from spamoor, correctly mapping "block_height" to Height.
+func (c spamoorAPIClient) GetClients() ([]spamoor.Client, error) {
+	url := fmt.Sprintf("%s/api/clients", c.api.BaseURL)
+	resp, err := c.client.Get(url)
+	if err != nil {
+		return nil, err
+	}
+	defer func() { _ = resp.Body.Close() }()
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		body, _ := io.ReadAll(resp.Body)
+		return nil, fmt.Errorf("get clients failed: %s", string(body))
+	}
+	var raw []clientResponse
+	if err := json.NewDecoder(resp.Body).Decode(&raw); err != nil {
+		return nil, err
+	}
+	clients := make([]spamoor.Client, len(raw))
+	for i, r := range raw {
+		clients[i] = spamoor.Client{
+			Index:   r.Index,
+			Name:    r.Name,
+			URL:     r.URL,
+			Groups:  r.Groups,
+			Enabled: r.Enabled,
+			Height:  r.BlockHeight,
+		}
+	}
+	return clients, nil
+}