From 6ed159057810603d64e0c0d77e782101955fdd2e Mon Sep 17 00:00:00 2001 From: Graham McIntire Date: Sat, 6 Jun 2026 14:42:26 -0500 Subject: [PATCH] chore: remove custom contains helpers, drop unnecessary comment --- .tool-versions | 1 + agent_test.go | 15 +-------------- mikrotik_test.go | 15 +-------------- update.go | 2 +- 4 files changed, 4 insertions(+), 29 deletions(-) create mode 100644 .tool-versions diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..5bc54b1 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +golang 1.26.4 diff --git a/agent_test.go b/agent_test.go index 005199a..bd1d603 100644 --- a/agent_test.go +++ b/agent_test.go @@ -35,7 +35,7 @@ func TestChannelMsgSerialization(t *testing.T) { s := string(data) checks := []string{"agent:123", "phx_join", "token", "test"} for _, c := range checks { - if !contains(s, c) { + if !strings.Contains(s, c) { t.Errorf("expected %q in JSON output %q", c, s) } } @@ -69,19 +69,6 @@ func TestChannelMsgNullRef(t *testing.T) { } } -func contains(s, substr string) bool { - return len(s) >= len(substr) && searchString(s, substr) -} - -func searchString(s, substr string) bool { - for i := 0; i <= len(s)-len(substr); i++ { - if s[i:i+len(substr)] == substr { - return true - } - } - return false -} - func testPools(t *testing.T) *jobPools { t.Helper() p := &jobPools{ diff --git a/mikrotik_test.go b/mikrotik_test.go index 1872287..7a7ea13 100644 --- a/mikrotik_test.go +++ b/mikrotik_test.go @@ -660,24 +660,11 @@ func TestReadWordExceedsMaxSize(t *testing.T) { if err == nil { t.Error("expected error for word exceeding max size") } - if !containsStr(err.Error(), "exceeds max") { + if !strings.Contains(err.Error(), "exceeds max") { t.Errorf("expected 'exceeds max' in error, got: %v", err) } } -func containsStr(s, sub string) bool { - return len(s) >= len(sub) && searchStr(s, sub) -} - -func searchStr(s, sub string) bool { - for i := 0; i <= len(s)-len(sub); i++ { - if s[i:i+len(sub)] == sub { - return true - } - } - return false -} - func TestReadSentenceError(t *testing.T) { // Buffer with valid length byte but truncated word data buf := bytes.NewBuffer([]byte{0x03, 'a'}) // length=3 but only 1 byte of data diff --git a/update.go b/update.go index 00658b9..c7dd4cf 100644 --- a/update.go +++ b/update.go @@ -85,7 +85,7 @@ func selfUpdate(downloadURL, expectedChecksum string) error { return fmt.Errorf("create temp: %w", err) } tempPath := tempFile.Name() - defer func() { _ = os.Remove(tempPath) }() // cleanup on any failure + defer func() { _ = os.Remove(tempPath) }() if _, err := tempFile.Write(body); err != nil { _ = tempFile.Close()