From efddad7d7ddbeaaef7e88bf1b4920c5b176e2f17 Mon Sep 17 00:00:00 2001 From: Joe Tsai Date: Thu, 8 Feb 2024 17:33:25 -0800 Subject: [PATCH] util/deephash: cleanup TODO in TestHash (#11080) Updates #cleanup Signed-off-by: Joe Tsai --- util/deephash/deephash_test.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/util/deephash/deephash_test.go b/util/deephash/deephash_test.go index 7a2d65ac6..76d8dde95 100644 --- a/util/deephash/deephash_test.go +++ b/util/deephash/deephash_test.go @@ -156,13 +156,7 @@ func TestHash(t *testing.T) { {in: tuple{netip.AddrPortFrom(netip.AddrFrom4([4]byte{192, 168, 0, 1}), 1234), netip.AddrPortFrom(netip.AddrFrom4([4]byte{192, 168, 0, 1}), 1235)}, wantEq: false}, {in: tuple{netip.AddrPortFrom(netip.AddrFrom4([4]byte{192, 168, 0, 1}), 1234), netip.AddrPortFrom(netip.AddrFrom4([4]byte{192, 168, 0, 2}), 1234)}, wantEq: false}, {in: tuple{netip.Prefix{}, netip.Prefix{}}, wantEq: true}, - - // In go1.21 PrefixFrom will now return a zero value Prefix if the - // provided Addr is unspecified. This is a change from previous - // behavior, so we disable this test for now. - // TODO(#8419): renable after go1.21 is released. - // {in: tuple{netip.Prefix{}, netip.PrefixFrom(netip.Addr{}, 1)}, wantEq: true}, - + {in: tuple{netip.Prefix{}, netip.PrefixFrom(netip.Addr{}, 1)}, wantEq: true}, {in: tuple{netip.Prefix{}, netip.PrefixFrom(netip.AddrFrom4([4]byte{}), 0)}, wantEq: false}, {in: tuple{netip.PrefixFrom(netip.AddrFrom4([4]byte{}), 1), netip.PrefixFrom(netip.AddrFrom4([4]byte{}), 1)}, wantEq: true}, {in: tuple{netip.PrefixFrom(netip.AddrFrom4([4]byte{192, 168, 0, 1}), 1), netip.PrefixFrom(netip.AddrFrom4([4]byte{192, 168, 0, 1}), 1)}, wantEq: true},