From d7d77d524a9b079ee6047bcc5d9734d6fc6e117a Mon Sep 17 00:00:00 2001 From: Roger Ng Date: Mon, 12 May 2025 16:08:10 +0000 Subject: [PATCH] Replace all `Url` with `URL` --- internal/hammer/loadtest/client.go | 6 ++--- internal/witness/witness_test.go | 40 +++++++++++++++--------------- witness.go | 6 ++--- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/internal/hammer/loadtest/client.go b/internal/hammer/loadtest/client.go index 50d8810a0..004318e37 100644 --- a/internal/hammer/loadtest/client.go +++ b/internal/hammer/loadtest/client.go @@ -58,7 +58,7 @@ func NewLogClients(readLogURLs, writeLogURLs []string, opts ClientOpts) (LogRead writeLogURLs = readLogURLs } - rootUrlOrDie := func(s string) *url.URL { + rootURLOrDie := func(s string) *url.URL { // url must reference a directory, by definition if !strings.HasSuffix(s, "/") { s += "/" @@ -72,11 +72,11 @@ func NewLogClients(readLogURLs, writeLogURLs []string, opts ClientOpts) (LogRead fetchers := []fetcher{} for _, s := range readLogURLs { - fetchers = append(fetchers, newFetcher(rootUrlOrDie(s), opts.BearerToken)) + fetchers = append(fetchers, newFetcher(rootURLOrDie(s), opts.BearerToken)) } writers := []httpLeafWriter{} for _, s := range writeLogURLs { - addURL, err := rootUrlOrDie(s).Parse("add") + addURL, err := rootURLOrDie(s).Parse("add") if err != nil { return nil, nil, fmt.Errorf("failed to create add URL: %v", err) } diff --git a/internal/witness/witness_test.go b/internal/witness/witness_test.go index 52473d37a..f6d8b803f 100644 --- a/internal/witness/witness_test.go +++ b/internal/witness/witness_test.go @@ -60,15 +60,15 @@ func TestWitnessGateway_Update(t *testing.T) { var wit2 tessera.Witness var witBad tessera.Witness ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - w1u, err := url.Parse(wit1.Url) + w1u, err := url.Parse(wit1.URL) if err != nil { t.Fatal(err) } - w2u, err := url.Parse(wit2.Url) + w2u, err := url.Parse(wit2.URL) if err != nil { t.Fatal(err) } - wbu, err := url.Parse(witBad.Url) + wbu, err := url.Parse(witBad.URL) if err != nil { t.Fatal(err) } @@ -84,19 +84,19 @@ func TestWitnessGateway_Update(t *testing.T) { t.Fatalf("Unknown case: %s", r.URL.String()) } })) - baseUrl, err := url.Parse(ts.URL) + baseURL, err := url.Parse(ts.URL) if err != nil { t.Fatal(err) } - wit1, err = tessera.NewWitness(wit1Vkey, baseUrl) + wit1, err = tessera.NewWitness(wit1Vkey, baseURL) if err != nil { t.Fatal(err) } - wit2, err = tessera.NewWitness(wit2Vkey, baseUrl) + wit2, err = tessera.NewWitness(wit2Vkey, baseURL) if err != nil { t.Fatal(err) } - witBad, err = tessera.NewWitness(witBadVkey, baseUrl) + witBad, err = tessera.NewWitness(witBadVkey, baseURL) if err != nil { t.Fatal(err) } @@ -232,9 +232,9 @@ func TestWitness_UpdateRequest(t *testing.T) { } _, _ = w.Write(sigForSigner(t, n.Text, wit1Skey)) })) - baseUrl := mustUrl(t, ts.URL) + baseURL := mustURL(t, ts.URL) var err error - wit1, err := tessera.NewWitness(wit1Vkey, baseUrl) + wit1, err := tessera.NewWitness(wit1Vkey, baseURL) if err != nil { t.Fatal(err) } @@ -305,8 +305,8 @@ func TestWitness_UpdateResponse(t *testing.T) { _, _ = w.Write(tC.body) })) - baseUrl := mustUrl(t, ts.URL) - wit1, err := tessera.NewWitness(wit1Vkey, baseUrl) + baseURL := mustURL(t, ts.URL) + wit1, err := tessera.NewWitness(wit1Vkey, baseURL) if err != nil { t.Fatal(err) } @@ -337,7 +337,7 @@ func TestWitnessStateEvolution(t *testing.T) { var wit1 tessera.Witness var count int ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - w1u := mustUrl(t, wit1.Url) + w1u := mustURL(t, wit1.URL) if got, want := r.URL.String(), w1u.Path; got != want { t.Fatalf("got request to URL %q but expected %q", got, want) } @@ -369,9 +369,9 @@ func TestWitnessStateEvolution(t *testing.T) { } count++ })) - baseUrl := mustUrl(t, ts.URL) + baseURL := mustURL(t, ts.URL) var err error - wit1, err = tessera.NewWitness(wit1Vkey, baseUrl) + wit1, err = tessera.NewWitness(wit1Vkey, baseURL) if err != nil { t.Fatal(err) } @@ -409,8 +409,8 @@ func TestWitnessReusesProofs(t *testing.T) { if err != nil { t.Fatal(err) } - w1u := mustUrl(t, wit1.Url) - w2u := mustUrl(t, wit2.Url) + w1u := mustURL(t, wit1.URL) + w2u := mustURL(t, wit2.URL) switch r.URL.String() { case w1u.Path: @@ -421,13 +421,13 @@ func TestWitnessReusesProofs(t *testing.T) { t.Fatalf("Unknown case: %s", r.URL.String()) } })) - baseUrl := mustUrl(t, ts.URL) + baseURL := mustURL(t, ts.URL) var err error - wit1, err = tessera.NewWitness(wit1Vkey, baseUrl) + wit1, err = tessera.NewWitness(wit1Vkey, baseURL) if err != nil { t.Fatal(err) } - wit2, err = tessera.NewWitness(wit2Vkey, baseUrl) + wit2, err = tessera.NewWitness(wit2Vkey, baseURL) if err != nil { t.Fatal(err) } @@ -484,7 +484,7 @@ func testLogTileFetcher(ctx context.Context, l, i uint64, p uint8) ([]byte, erro return os.ReadFile(path) } -func mustUrl(t *testing.T, u string) *url.URL { +func mustURL(t *testing.T, u string) *url.URL { t.Helper() parsed, err := url.Parse(u) if err != nil { diff --git a/witness.go b/witness.go index 915216335..5a19de213 100644 --- a/witness.go +++ b/witness.go @@ -60,7 +60,7 @@ func NewWitness(vkey string, witnessRoot *url.URL) (Witness, error) { return Witness{ Key: v, - Url: u.String(), + URL: u.String(), }, err } @@ -69,7 +69,7 @@ func NewWitness(vkey string, witnessRoot *url.URL) (Witness, error) { // provides a predicate to check whether this witness has signed a checkpoint. type Witness struct { Key note.Verifier - Url string + URL string } // Satisfied returns true if the checkpoint provided is signed by this witness. @@ -89,7 +89,7 @@ func (w Witness) Satisfied(cp []byte) bool { // the witness with a new checkpoint, to the value which is the verifier to check // the response is well formed. func (w Witness) Endpoints() map[string]note.Verifier { - return map[string]note.Verifier{w.Url: w.Key} + return map[string]note.Verifier{w.URL: w.Key} } // NewWitnessGroup creates a grouping of Witness or WitnessGroup with a configurable threshold