From 3fc713ccfcc96738d981a97647a84a6cb6bbec04 Mon Sep 17 00:00:00 2001 From: xegineering Date: Tue, 1 Oct 2024 22:20:47 +0200 Subject: Make soundbox package top-level It is not expected that this library will be so big that multiple packages make sense. Thus it should start only with the main package. --- soundbox.go | 25 +++++++++++++++++++++++++ soundbox/soundbox.go | 25 ------------------------- soundbox/soundbox_test.go | 25 ------------------------- soundbox_test.go | 25 +++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 50 deletions(-) create mode 100644 soundbox.go delete mode 100644 soundbox/soundbox.go delete mode 100644 soundbox/soundbox_test.go create mode 100644 soundbox_test.go diff --git a/soundbox.go b/soundbox.go new file mode 100644 index 0000000..fcabcdc --- /dev/null +++ b/soundbox.go @@ -0,0 +1,25 @@ +package soundbox + +import ( + "fmt" + "net" +) + +type Soundbox struct { + HardwareAddr net.HardwareAddr +} + +func NewSoundbox(mac string) (Soundbox, error) { + hardwareAddr, err := net.ParseMAC(mac) + if err != nil { + return Soundbox{}, err + } + + if len(hardwareAddr) != 6 { + return Soundbox{}, fmt.Errorf("Only IEEE 802 MAC-48 addresses supported") + } + + return Soundbox{ + HardwareAddr: hardwareAddr, + }, nil +} diff --git a/soundbox/soundbox.go b/soundbox/soundbox.go deleted file mode 100644 index fcabcdc..0000000 --- a/soundbox/soundbox.go +++ /dev/null @@ -1,25 +0,0 @@ -package soundbox - -import ( - "fmt" - "net" -) - -type Soundbox struct { - HardwareAddr net.HardwareAddr -} - -func NewSoundbox(mac string) (Soundbox, error) { - hardwareAddr, err := net.ParseMAC(mac) - if err != nil { - return Soundbox{}, err - } - - if len(hardwareAddr) != 6 { - return Soundbox{}, fmt.Errorf("Only IEEE 802 MAC-48 addresses supported") - } - - return Soundbox{ - HardwareAddr: hardwareAddr, - }, nil -} diff --git a/soundbox/soundbox_test.go b/soundbox/soundbox_test.go deleted file mode 100644 index 6a5cde3..0000000 --- a/soundbox/soundbox_test.go +++ /dev/null @@ -1,25 +0,0 @@ -package soundbox - -import ( - "testing" -) - -func TestNewSoundbox(t *testing.T) { - // valid MAC should succeed - _, err := NewSoundbox("12:34:56:ab:cd:ef") - if err != nil { - t.Errorf("NewSoundbox() failed: %v", err) - } - - // invalid MAC should fail - _, err = NewSoundbox("12:34:56:ab:cd") - if err == nil { - t.Errorf("NewSoundbox() failed: %v", err) - } - - // No EUI-64 supported - _, err = NewSoundbox("12:34:56:ab:cd:ef:12:45") - if err == nil { - t.Errorf("NewSoundbox() failed: %v", err) - } -} diff --git a/soundbox_test.go b/soundbox_test.go new file mode 100644 index 0000000..6a5cde3 --- /dev/null +++ b/soundbox_test.go @@ -0,0 +1,25 @@ +package soundbox + +import ( + "testing" +) + +func TestNewSoundbox(t *testing.T) { + // valid MAC should succeed + _, err := NewSoundbox("12:34:56:ab:cd:ef") + if err != nil { + t.Errorf("NewSoundbox() failed: %v", err) + } + + // invalid MAC should fail + _, err = NewSoundbox("12:34:56:ab:cd") + if err == nil { + t.Errorf("NewSoundbox() failed: %v", err) + } + + // No EUI-64 supported + _, err = NewSoundbox("12:34:56:ab:cd:ef:12:45") + if err == nil { + t.Errorf("NewSoundbox() failed: %v", err) + } +} -- cgit v1.2.3-70-g09d2