From e383fca1f5ae43b82253bf430bbaa70c6768d1f9 Mon Sep 17 00:00:00 2001
From: ramin <raminkeene@gmail.com>
Date: Mon, 8 Jan 2024 13:05:14 +0000
Subject: [PATCH] test: cleanup of PR 2998 to simplify (#3051)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Thank you for submitting a pull request!

Please make sure you have reviewed our contributors guide before
submitting your
first PR.

Please ensure you've addressed or included references to any related
issues.

Tips:
- Use keywords like "closes" or "fixes" followed by an issue number to
automatically close related issues when the PR is merged (e.g., "closes
#123" or "fixes #123").
- Describe the changes made in the PR.
- Ensure the PR has one of the required tags (kind:fix, kind:misc,
kind:break!, kind:refactor, kind:feat, kind:deps, kind:docs, kind:ci,
kind:chore, kind:testing)

-->

in kind replacement of
https://github.com/celestiaorg/celestia-node/pull/2998 with the
simplified require assertion

---------

Co-authored-by: Håvard Anda Estensen <haavard.ae@gmail.com>
---
 libs/utils/address.go      | 5 ++++-
 libs/utils/address_test.go | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/libs/utils/address.go b/libs/utils/address.go
index ae52a03b16..c20d11ad06 100644
--- a/libs/utils/address.go
+++ b/libs/utils/address.go
@@ -1,11 +1,14 @@
 package utils
 
 import (
+	"errors"
 	"fmt"
 	"net"
 	"strings"
 )
 
+var ErrInvalidIP = errors.New("invalid IP address or hostname given")
+
 // SanitizeAddr trims leading protocol scheme and port from the given
 // IP address or hostname if present.
 func SanitizeAddr(addr string) (string, error) {
@@ -16,7 +19,7 @@ func SanitizeAddr(addr string) (string, error) {
 	addr = strings.TrimSuffix(addr, "/")
 	addr = strings.Split(addr, ":")[0]
 	if addr == "" {
-		return "", fmt.Errorf("invalid IP address or hostname given: %s", original)
+		return "", fmt.Errorf("%w: %s", ErrInvalidIP, original)
 	}
 	return addr, nil
 }
diff --git a/libs/utils/address_test.go b/libs/utils/address_test.go
index 15452f4d1b..48a7747a4a 100644
--- a/libs/utils/address_test.go
+++ b/libs/utils/address_test.go
@@ -11,6 +11,7 @@ func TestSanitizeAddr(t *testing.T) {
 	var tests = []struct {
 		addr string
 		want string
+		err  error
 	}{
 		// Testcase: trims protocol prefix
 		{addr: "http://celestia.org", want: "celestia.org"},
@@ -20,13 +21,15 @@ func TestSanitizeAddr(t *testing.T) {
 		{addr: "tcp://192.168.42.42:5050/", want: "192.168.42.42"},
 		// Testcase: invariant ip
 		{addr: "192.168.42.42", want: "192.168.42.42"},
+		// Testcase: empty addr
+		{addr: "", want: "", err: ErrInvalidIP},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.addr, func(t *testing.T) {
 			got, err := SanitizeAddr(tt.addr)
-			require.NoError(t, err)
 			require.Equal(t, tt.want, got)
+			require.ErrorIs(t, err, tt.err)
 		})
 	}
 }