dhcpv4: simplify marshaling options to binary.

- Consolidate writing the option code and length to Options.Marshal
  rather than doing it in each individual option.
- Use uio in marshaling code.

1 files changed, 1 insertions, 13 deletions

diff --git a/dhcpv4/option_generic_test.go b/dhcpv4/option_generic_test.go
index 5c34903..8a1acc1 100644
--- a/dhcpv4/option_generic_test.go
+++ b/dhcpv4/option_generic_test.go
@@ -26,19 +26,7 @@ func TestOptionGenericToBytes(t *testing.T) {
 		Data:       []byte{byte(MessageTypeDiscover)},
 	}
 	serialized := o.ToBytes()
-	expected := []byte{53, 1, 1}
-	require.Equal(t, expected, serialized)
-}
-
-func TestOptionGenericToBytesZeroOptions(t *testing.T) {
-	o := OptionGeneric{OptionCode: OptionEnd}
-	serialized := o.ToBytes()
-	expected := []byte{255}
-	require.Equal(t, expected, serialized)
-
-	o = OptionGeneric{OptionCode: OptionPad}
-	serialized = o.ToBytes()
-	expected = []byte{0}
+	expected := []byte{1}
 	require.Equal(t, expected, serialized)
 }