From 317518d68ef5cddeed6d6da0cf7395101ce5e8e2 Mon Sep 17 00:00:00 2001 From: Karol Lassak Date: Thu, 24 Mar 2022 15:00:46 +0100 Subject: [PATCH] Fix all linter issues (#16) * Fix all linter issues * Dont run all linters --- .github/workflows/build.yml | 3 +-- address_v4_test.go | 2 ++ address_v6_test.go | 2 ++ bits.go | 19 ------------------- bool_tree/tree_v4.go | 4 +++- bool_tree/tree_v4_manual.go | 1 + bool_tree/tree_v6_generated.go | 4 +++- bool_tree/tree_v6_manual.go | 1 + byte_tree/tree_v4.go | 4 +++- byte_tree/tree_v4_manual.go | 1 + byte_tree/tree_v6_generated.go | 4 +++- byte_tree/tree_v6_manual.go | 1 + complex128_tree/tree_v4.go | 4 +++- complex128_tree/tree_v4_manual.go | 1 + complex128_tree/tree_v6_generated.go | 4 +++- complex128_tree/tree_v6_manual.go | 1 + complex64_tree/tree_v4.go | 4 +++- complex64_tree/tree_v4_manual.go | 1 + complex64_tree/tree_v6_generated.go | 4 +++- complex64_tree/tree_v6_manual.go | 1 + float32_tree/tree_v4.go | 4 +++- float32_tree/tree_v4_manual.go | 1 + float32_tree/tree_v6_generated.go | 4 +++- float32_tree/tree_v6_manual.go | 1 + float64_tree/tree_v4.go | 4 +++- float64_tree/tree_v4_manual.go | 1 + float64_tree/tree_v6_generated.go | 4 +++- float64_tree/tree_v6_manual.go | 1 + int16_tree/tree_v4.go | 4 +++- int16_tree/tree_v4_manual.go | 1 + int16_tree/tree_v6_generated.go | 4 +++- int16_tree/tree_v6_manual.go | 1 + int32_tree/tree_v4.go | 4 +++- int32_tree/tree_v4_manual.go | 1 + int32_tree/tree_v6_generated.go | 4 +++- int32_tree/tree_v6_manual.go | 1 + int64_tree/tree_v4.go | 4 +++- int64_tree/tree_v4_manual.go | 1 + int64_tree/tree_v6_generated.go | 4 +++- int64_tree/tree_v6_manual.go | 1 + int8_tree/tree_v4.go | 4 +++- int8_tree/tree_v4_manual.go | 1 + int8_tree/tree_v6_generated.go | 4 +++- int8_tree/tree_v6_manual.go | 1 + int_tree/tree_v4.go | 4 +++- int_tree/tree_v4_manual.go | 1 + int_tree/tree_v6_generated.go | 4 +++- int_tree/tree_v6_manual.go | 1 + net_test.go | 11 ++++++----- rune_tree/tree_v4.go | 4 +++- rune_tree/tree_v4_manual.go | 1 + rune_tree/tree_v6_generated.go | 4 +++- rune_tree/tree_v6_manual.go | 1 + string_tree/tree_v4.go | 4 +++- string_tree/tree_v4_manual.go | 1 + string_tree/tree_v6_generated.go | 4 +++- string_tree/tree_v6_manual.go | 1 + template/tree_v4.go | 4 +++- template/tree_v4_bulk_test.go | 20 -------------------- template/tree_v4_manual.go | 1 + template/tree_v4_test.go | 18 ++++-------------- template/tree_v6_generated.go | 4 +++- template/tree_v6_manual.go | 1 + uint16_tree/tree_v4.go | 4 +++- uint16_tree/tree_v4_manual.go | 1 + uint16_tree/tree_v6_generated.go | 4 +++- uint16_tree/tree_v6_manual.go | 1 + uint32_tree/tree_v4.go | 4 +++- uint32_tree/tree_v4_manual.go | 1 + uint32_tree/tree_v6_generated.go | 4 +++- uint32_tree/tree_v6_manual.go | 1 + uint64_tree/tree_v4.go | 4 +++- uint64_tree/tree_v4_manual.go | 1 + uint64_tree/tree_v6_generated.go | 4 +++- uint64_tree/tree_v6_manual.go | 1 + uint8_tree/tree_v4.go | 4 +++- uint8_tree/tree_v4_manual.go | 1 + uint8_tree/tree_v6_generated.go | 4 +++- uint8_tree/tree_v6_manual.go | 1 + uint_tree/tree_v4.go | 4 +++- uint_tree/tree_v4_manual.go | 1 + uint_tree/tree_v6_generated.go | 4 +++- uint_tree/tree_v6_manual.go | 1 + 83 files changed, 167 insertions(+), 98 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b54aa58..9469b6a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,9 +35,8 @@ jobs: - name: Run linters uses: golangci/golangci-lint-action@v2 with: - version: v1.29 + version: v1.45.0 only-new-issues: true - args: --enable-all coverage: runs-on: ubuntu-latest diff --git a/address_v4_test.go b/address_v4_test.go index 16134ba..2120024 100644 --- a/address_v4_test.go +++ b/address_v4_test.go @@ -16,7 +16,9 @@ func TestNewIPv4Address(t *testing.T) { assert.Equal(t, uint(7), sut.Length) assert.Equal(t, "1.35.69.103/7", sut.String()) assert.Equal(t, "1.35.69.103/7", (&sut).String()) + //nolint assert.Equal(t, "1.35.69.103/7", fmt.Sprintf("%s", sut)) + //nolint assert.Equal(t, "1.35.69.103/7", fmt.Sprintf("%s", &sut)) } diff --git a/address_v6_test.go b/address_v6_test.go index 23ff158..58910ef 100644 --- a/address_v6_test.go +++ b/address_v6_test.go @@ -13,7 +13,9 @@ func TestNewIPv6Address(t *testing.T) { assert.Equal(t, uint64(0x0123456789A0A1A2), sut.Left) assert.Equal(t, uint64(0xA3A4A5A6A7A8A9B0), sut.Right) assert.Equal(t, uint(117), sut.Length) + //nolint assert.Equal(t, "123:4567:89a0:a1a2:a3a4:a5a6:a7a8:a9b0/117", fmt.Sprintf("%s", sut)) + //nolint assert.Equal(t, "123:4567:89a0:a1a2:a3a4:a5a6:a7a8:a9b0/117", fmt.Sprintf("%s", &sut)) assert.Equal(t, "123:4567:89a0:a1a2:a3a4:a5a6:a7a8:a9b0/117", (&sut).String()) assert.Equal(t, "123:4567:89a0:a1a2:a3a4:a5a6:a7a8:a9b0/117", sut.String()) diff --git a/bits.go b/bits.go index 69f5cd7..8de5c96 100644 --- a/bits.go +++ b/bits.go @@ -1,24 +1,5 @@ package patricia -var _len8tab = [256]uint8{ - 0x00, 0x01, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, - 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, - 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, - 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, -} - var _leftMasks32 []uint32 var _leftMasks64 []uint64 diff --git a/bool_tree/tree_v4.go b/bool_tree/tree_v4.go index 1e43254..77be44b 100644 --- a/bool_tree/tree_v4.go +++ b/bool_tree/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]bool), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []bool, address patricia.IPv4Address) } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/bool_tree/tree_v4_manual.go b/bool_tree/tree_v4_manual.go index 833a9f9..c1ac1e3 100644 --- a/bool_tree/tree_v4_manual.go +++ b/bool_tree/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]bool, 0) for i := range t.nodes { diff --git a/bool_tree/tree_v6_generated.go b/bool_tree/tree_v6_generated.go index 800485e..2a0e1a7 100644 --- a/bool_tree/tree_v6_generated.go +++ b/bool_tree/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]bool), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []bool, address patricia.IPv6Address) } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/bool_tree/tree_v6_manual.go b/bool_tree/tree_v6_manual.go index b209e5f..305f175 100644 --- a/bool_tree/tree_v6_manual.go +++ b/bool_tree/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]bool, 0) for i := range t.nodes { diff --git a/byte_tree/tree_v4.go b/byte_tree/tree_v4.go index 7e7e712..f9117ff 100644 --- a/byte_tree/tree_v4.go +++ b/byte_tree/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]byte), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []byte, address patricia.IPv4Address) } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/byte_tree/tree_v4_manual.go b/byte_tree/tree_v4_manual.go index e9edfa8..8afcef7 100644 --- a/byte_tree/tree_v4_manual.go +++ b/byte_tree/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]byte, 0) for i := range t.nodes { diff --git a/byte_tree/tree_v6_generated.go b/byte_tree/tree_v6_generated.go index 29d49af..7a0c6fe 100644 --- a/byte_tree/tree_v6_generated.go +++ b/byte_tree/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]byte), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []byte, address patricia.IPv6Address) } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/byte_tree/tree_v6_manual.go b/byte_tree/tree_v6_manual.go index 5dff890..0be8523 100644 --- a/byte_tree/tree_v6_manual.go +++ b/byte_tree/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]byte, 0) for i := range t.nodes { diff --git a/complex128_tree/tree_v4.go b/complex128_tree/tree_v4.go index 10f1650..e055a1e 100644 --- a/complex128_tree/tree_v4.go +++ b/complex128_tree/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]complex128), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []complex128, address patricia.IPv4Ad } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/complex128_tree/tree_v4_manual.go b/complex128_tree/tree_v4_manual.go index 12730a5..d5728a7 100644 --- a/complex128_tree/tree_v4_manual.go +++ b/complex128_tree/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]complex128, 0) for i := range t.nodes { diff --git a/complex128_tree/tree_v6_generated.go b/complex128_tree/tree_v6_generated.go index df1293f..adee05d 100644 --- a/complex128_tree/tree_v6_generated.go +++ b/complex128_tree/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]complex128), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []complex128, address patricia.IPv6Ad } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/complex128_tree/tree_v6_manual.go b/complex128_tree/tree_v6_manual.go index 0c81ed1..411ecf0 100644 --- a/complex128_tree/tree_v6_manual.go +++ b/complex128_tree/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]complex128, 0) for i := range t.nodes { diff --git a/complex64_tree/tree_v4.go b/complex64_tree/tree_v4.go index 92a3a31..ef53397 100644 --- a/complex64_tree/tree_v4.go +++ b/complex64_tree/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]complex64), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []complex64, address patricia.IPv4Add } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/complex64_tree/tree_v4_manual.go b/complex64_tree/tree_v4_manual.go index 5351cd0..65d1bff 100644 --- a/complex64_tree/tree_v4_manual.go +++ b/complex64_tree/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]complex64, 0) for i := range t.nodes { diff --git a/complex64_tree/tree_v6_generated.go b/complex64_tree/tree_v6_generated.go index bda546b..46ae1b4 100644 --- a/complex64_tree/tree_v6_generated.go +++ b/complex64_tree/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]complex64), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []complex64, address patricia.IPv6Add } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/complex64_tree/tree_v6_manual.go b/complex64_tree/tree_v6_manual.go index 2a4604a..a0de5f8 100644 --- a/complex64_tree/tree_v6_manual.go +++ b/complex64_tree/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]complex64, 0) for i := range t.nodes { diff --git a/float32_tree/tree_v4.go b/float32_tree/tree_v4.go index 629b8e6..b16280d 100644 --- a/float32_tree/tree_v4.go +++ b/float32_tree/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]float32), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []float32, address patricia.IPv4Addre } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/float32_tree/tree_v4_manual.go b/float32_tree/tree_v4_manual.go index 687fbdb..cd1204d 100644 --- a/float32_tree/tree_v4_manual.go +++ b/float32_tree/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]float32, 0) for i := range t.nodes { diff --git a/float32_tree/tree_v6_generated.go b/float32_tree/tree_v6_generated.go index 81232ee..781cf1d 100644 --- a/float32_tree/tree_v6_generated.go +++ b/float32_tree/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]float32), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []float32, address patricia.IPv6Addre } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/float32_tree/tree_v6_manual.go b/float32_tree/tree_v6_manual.go index f46002c..92a64b4 100644 --- a/float32_tree/tree_v6_manual.go +++ b/float32_tree/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]float32, 0) for i := range t.nodes { diff --git a/float64_tree/tree_v4.go b/float64_tree/tree_v4.go index 9516fab..154f7f9 100644 --- a/float64_tree/tree_v4.go +++ b/float64_tree/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]float64), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []float64, address patricia.IPv4Addre } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/float64_tree/tree_v4_manual.go b/float64_tree/tree_v4_manual.go index adcdcf8..83a43a2 100644 --- a/float64_tree/tree_v4_manual.go +++ b/float64_tree/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]float64, 0) for i := range t.nodes { diff --git a/float64_tree/tree_v6_generated.go b/float64_tree/tree_v6_generated.go index 8d05d61..c2bf39e 100644 --- a/float64_tree/tree_v6_generated.go +++ b/float64_tree/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]float64), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []float64, address patricia.IPv6Addre } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/float64_tree/tree_v6_manual.go b/float64_tree/tree_v6_manual.go index c5fc87e..0952e69 100644 --- a/float64_tree/tree_v6_manual.go +++ b/float64_tree/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]float64, 0) for i := range t.nodes { diff --git a/int16_tree/tree_v4.go b/int16_tree/tree_v4.go index 38b5024..a7d96c6 100644 --- a/int16_tree/tree_v4.go +++ b/int16_tree/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]int16), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []int16, address patricia.IPv4Address } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/int16_tree/tree_v4_manual.go b/int16_tree/tree_v4_manual.go index 4dbc45c..5d77c6b 100644 --- a/int16_tree/tree_v4_manual.go +++ b/int16_tree/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]int16, 0) for i := range t.nodes { diff --git a/int16_tree/tree_v6_generated.go b/int16_tree/tree_v6_generated.go index 6ee4829..1c81437 100644 --- a/int16_tree/tree_v6_generated.go +++ b/int16_tree/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]int16), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []int16, address patricia.IPv6Address } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/int16_tree/tree_v6_manual.go b/int16_tree/tree_v6_manual.go index d8424e4..aecfcd2 100644 --- a/int16_tree/tree_v6_manual.go +++ b/int16_tree/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]int16, 0) for i := range t.nodes { diff --git a/int32_tree/tree_v4.go b/int32_tree/tree_v4.go index 72c957c..710d41b 100644 --- a/int32_tree/tree_v4.go +++ b/int32_tree/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]int32), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []int32, address patricia.IPv4Address } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/int32_tree/tree_v4_manual.go b/int32_tree/tree_v4_manual.go index b7786d4..334a4be 100644 --- a/int32_tree/tree_v4_manual.go +++ b/int32_tree/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]int32, 0) for i := range t.nodes { diff --git a/int32_tree/tree_v6_generated.go b/int32_tree/tree_v6_generated.go index c657206..fb52924 100644 --- a/int32_tree/tree_v6_generated.go +++ b/int32_tree/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]int32), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []int32, address patricia.IPv6Address } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/int32_tree/tree_v6_manual.go b/int32_tree/tree_v6_manual.go index cb834cf..404f68f 100644 --- a/int32_tree/tree_v6_manual.go +++ b/int32_tree/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]int32, 0) for i := range t.nodes { diff --git a/int64_tree/tree_v4.go b/int64_tree/tree_v4.go index 055b3b3..245f56e 100644 --- a/int64_tree/tree_v4.go +++ b/int64_tree/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]int64), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []int64, address patricia.IPv4Address } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/int64_tree/tree_v4_manual.go b/int64_tree/tree_v4_manual.go index a45eb98..b3d9d72 100644 --- a/int64_tree/tree_v4_manual.go +++ b/int64_tree/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]int64, 0) for i := range t.nodes { diff --git a/int64_tree/tree_v6_generated.go b/int64_tree/tree_v6_generated.go index 7c75a91..ab2bb34 100644 --- a/int64_tree/tree_v6_generated.go +++ b/int64_tree/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]int64), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []int64, address patricia.IPv6Address } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/int64_tree/tree_v6_manual.go b/int64_tree/tree_v6_manual.go index c6a673e..35c3105 100644 --- a/int64_tree/tree_v6_manual.go +++ b/int64_tree/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]int64, 0) for i := range t.nodes { diff --git a/int8_tree/tree_v4.go b/int8_tree/tree_v4.go index 36eb552..3500820 100644 --- a/int8_tree/tree_v4.go +++ b/int8_tree/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]int8), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []int8, address patricia.IPv4Address) } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/int8_tree/tree_v4_manual.go b/int8_tree/tree_v4_manual.go index 4bf0bbd..1ef2da4 100644 --- a/int8_tree/tree_v4_manual.go +++ b/int8_tree/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]int8, 0) for i := range t.nodes { diff --git a/int8_tree/tree_v6_generated.go b/int8_tree/tree_v6_generated.go index dda7d67..26cfa8d 100644 --- a/int8_tree/tree_v6_generated.go +++ b/int8_tree/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]int8), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []int8, address patricia.IPv6Address) } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/int8_tree/tree_v6_manual.go b/int8_tree/tree_v6_manual.go index ce9b132..75bb9d2 100644 --- a/int8_tree/tree_v6_manual.go +++ b/int8_tree/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]int8, 0) for i := range t.nodes { diff --git a/int_tree/tree_v4.go b/int_tree/tree_v4.go index 4d07772..d1846d9 100644 --- a/int_tree/tree_v4.go +++ b/int_tree/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]int), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []int, address patricia.IPv4Address) } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/int_tree/tree_v4_manual.go b/int_tree/tree_v4_manual.go index 3fafaa5..86ff3c7 100644 --- a/int_tree/tree_v4_manual.go +++ b/int_tree/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]int, 0) for i := range t.nodes { diff --git a/int_tree/tree_v6_generated.go b/int_tree/tree_v6_generated.go index 2a74df6..224ab88 100644 --- a/int_tree/tree_v6_generated.go +++ b/int_tree/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]int), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []int, address patricia.IPv6Address) } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/int_tree/tree_v6_manual.go b/int_tree/tree_v6_manual.go index a8a4c35..c4eae23 100644 --- a/int_tree/tree_v6_manual.go +++ b/int_tree/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]int, 0) for i := range t.nodes { diff --git a/net_test.go b/net_test.go index a211356..8824413 100644 --- a/net_test.go +++ b/net_test.go @@ -12,10 +12,10 @@ func TestParseIPFromString(t *testing.T) { var v6IP *IPv6Address var err error - v4IP, v6IP, err = ParseIPFromString("sdfkjsdfdsfd") + _, _, err = ParseIPFromString("sdfkjsdfdsfd") assert.Error(t, err) - v4IP, v6IP, err = ParseIPFromString("") + _, _, err = ParseIPFromString("") assert.Error(t, err) v4IP, v6IP, err = ParseIPFromString("0.0.0.0/0") @@ -30,10 +30,10 @@ func TestParseIPFromString(t *testing.T) { assert.NotNil(t, v4IP) assert.Nil(t, v6IP) - v4IP, v6IP, err = ParseIPFromString("127.0.0.1/999") + _, _, err = ParseIPFromString("127.0.0.1/999") assert.Error(t, err) - v4IP, v6IP, err = ParseIPFromString("127.0.0.1/33") + _, _, err = ParseIPFromString("127.0.0.1/33") assert.Error(t, err) v4IP, v6IP, err = ParseIPFromString("1.0.16.0/0") @@ -70,7 +70,7 @@ func TestParseIPFromString(t *testing.T) { assert.Equal(t, uint64(0x20010db885a30000), v6IP.Left) assert.Equal(t, uint64(0x00008a2e03707334), v6IP.Right) - v4IP, v6IP, err = ParseIPFromString("2001:0db8:85a3:0000:0000:8a2e:0370:7334/129") + _, _, err = ParseIPFromString("2001:0db8:85a3:0000:0000:8a2e:0370:7334/129") assert.Error(t, err) v4IP, v6IP, err = ParseIPFromString("2001:0db8:85a3:0000:0000:8a2e:0370:7334/16") @@ -83,6 +83,7 @@ func TestParseIPFromString(t *testing.T) { _, ipr, _ := net.ParseCIDR("2001:0db8:85a3:0000:0000:8a2e:0370:7334/16") v4IP, v6IP, err = ParseFromIPAddr(ipr) + assert.NoError(t, err) assert.Nil(t, v4IP) assert.NotNil(t, v6IP) assert.Equal(t, uint(16), v6IP.Length) diff --git a/rune_tree/tree_v4.go b/rune_tree/tree_v4.go index ca5e837..6967a87 100644 --- a/rune_tree/tree_v4.go +++ b/rune_tree/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]rune), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []rune, address patricia.IPv4Address) } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/rune_tree/tree_v4_manual.go b/rune_tree/tree_v4_manual.go index e016d74..ef7669b 100644 --- a/rune_tree/tree_v4_manual.go +++ b/rune_tree/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]rune, 0) for i := range t.nodes { diff --git a/rune_tree/tree_v6_generated.go b/rune_tree/tree_v6_generated.go index fd6b9da..bfe35fc 100644 --- a/rune_tree/tree_v6_generated.go +++ b/rune_tree/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]rune), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []rune, address patricia.IPv6Address) } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/rune_tree/tree_v6_manual.go b/rune_tree/tree_v6_manual.go index 2fa1470..59ef0bd 100644 --- a/rune_tree/tree_v6_manual.go +++ b/rune_tree/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]rune, 0) for i := range t.nodes { diff --git a/string_tree/tree_v4.go b/string_tree/tree_v4.go index b47a65e..cd1c6fa 100644 --- a/string_tree/tree_v4.go +++ b/string_tree/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]string), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []string, address patricia.IPv4Addres } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/string_tree/tree_v4_manual.go b/string_tree/tree_v4_manual.go index 2bc0bae..e5c8b0d 100644 --- a/string_tree/tree_v4_manual.go +++ b/string_tree/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]string, 0) for i := range t.nodes { diff --git a/string_tree/tree_v6_generated.go b/string_tree/tree_v6_generated.go index 6434c67..aaa1849 100644 --- a/string_tree/tree_v6_generated.go +++ b/string_tree/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]string), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []string, address patricia.IPv6Addres } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/string_tree/tree_v6_manual.go b/string_tree/tree_v6_manual.go index cbc2987..b0a6948 100644 --- a/string_tree/tree_v6_manual.go +++ b/string_tree/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]string, 0) for i := range t.nodes { diff --git a/template/tree_v4.go b/template/tree_v4.go index 077ff8b..65326c9 100644 --- a/template/tree_v4.go +++ b/template/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]GeneratedType), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []GeneratedType, address patricia.IPv } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/template/tree_v4_bulk_test.go b/template/tree_v4_bulk_test.go index 8b1d584..51c5c9f 100644 --- a/template/tree_v4_bulk_test.go +++ b/template/tree_v4_bulk_test.go @@ -137,23 +137,3 @@ func TestBulkLoad(t *testing.T) { //print() } - -func arraysEqual(tag string, expected []string, found []GeneratedType) bool { - if len(expected) != len(found) { - return false - } - - for _, tagA := range expected { - didFind := false - for _, tagB := range found { - if tagB == tagA { - didFind = true - break - } - } - if !didFind { - return false - } - } - return true -} diff --git a/template/tree_v4_manual.go b/template/tree_v4_manual.go index 106cbd6..ca93e0a 100644 --- a/template/tree_v4_manual.go +++ b/template/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]GeneratedType, 0) for i := range t.nodes { diff --git a/template/tree_v4_test.go b/template/tree_v4_test.go index 46e77a6..2dde59c 100644 --- a/template/tree_v4_test.go +++ b/template/tree_v4_test.go @@ -286,7 +286,7 @@ func TestTree2(t *testing.T) { func TestFindDeepestTags(t *testing.T) { assert := assert.New(t) - tags := make([]GeneratedType, 0) + var tags []GeneratedType found := false tree := NewTreeV4() @@ -506,8 +506,7 @@ func TestSimpleTree1FindTags(t *testing.T) { tree.Add(ipv4b, "tagB", nil) tree.Add(ipv4c, "tagC", nil) - tags := make([]GeneratedType, 0) - tags = tree.FindTags(ipv4FromBytes([]byte{98, 139, 183, 24}, 32)) + tags := tree.FindTags(ipv4FromBytes([]byte{98, 139, 183, 24}, 32)) assert.Equal(t, 1, len(tags)) assert.Equal(t, "tagA", tags[0]) @@ -603,8 +602,7 @@ func TestSimpleTree1Filter(t *testing.T) { tree.Add(ipv4c, "tagC", nil) include = false - tags := make([]GeneratedType, 0) - tags = tree.FindTagsWithFilter(ipv4FromBytes([]byte{98, 139, 183, 24}, 32), filterFunc) + tags := tree.FindTagsWithFilter(ipv4FromBytes([]byte{98, 139, 183, 24}, 32), filterFunc) assert.Equal(0, len(tags)) include = true @@ -958,6 +956,7 @@ func TestSet(t *testing.T) { // add a parent node, just to mix things up countIncreased, count := tree.Set(ipv4FromBytes([]byte{1, 2, 3, 0}, 24), "parent") + assert.True(t, countIncreased) assert.Equal(t, 1, count) countIncreased, count = tree.Set(address, "tagA") @@ -1180,7 +1179,6 @@ func TestTagsMap(t *testing.T) { tags = tags[:0] assert.Equal(t, "tagC", tree.tagsForNode(tags, 1, nil)[1]) - tags = tags[:0] } // test duplicate tags with no match func @@ -1261,11 +1259,3 @@ func TestDuplicateTagsWithMatchFunc(t *testing.T) { assert.False(t, wasAdded) assert.Equal(t, 2, count) } - -func payloadToByteArrays(tags []GeneratedType) [][]byte { - ret := make([][]byte, 0, len(tags)) - for _, tag := range tags { - ret = append(ret, tag.([]byte)) - } - return ret -} diff --git a/template/tree_v6_generated.go b/template/tree_v6_generated.go index afd3ca8..f4248c7 100644 --- a/template/tree_v6_generated.go +++ b/template/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]GeneratedType), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []GeneratedType, address patricia.IPv } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/template/tree_v6_manual.go b/template/tree_v6_manual.go index 26688b3..2c4e52e 100644 --- a/template/tree_v6_manual.go +++ b/template/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]GeneratedType, 0) for i := range t.nodes { diff --git a/uint16_tree/tree_v4.go b/uint16_tree/tree_v4.go index 8ef258d..f902ae1 100644 --- a/uint16_tree/tree_v4.go +++ b/uint16_tree/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]uint16), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []uint16, address patricia.IPv4Addres } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/uint16_tree/tree_v4_manual.go b/uint16_tree/tree_v4_manual.go index bae1cce..cbb0316 100644 --- a/uint16_tree/tree_v4_manual.go +++ b/uint16_tree/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]uint16, 0) for i := range t.nodes { diff --git a/uint16_tree/tree_v6_generated.go b/uint16_tree/tree_v6_generated.go index c1c2757..03bf1b4 100644 --- a/uint16_tree/tree_v6_generated.go +++ b/uint16_tree/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]uint16), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []uint16, address patricia.IPv6Addres } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/uint16_tree/tree_v6_manual.go b/uint16_tree/tree_v6_manual.go index 16b5d4b..6613637 100644 --- a/uint16_tree/tree_v6_manual.go +++ b/uint16_tree/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]uint16, 0) for i := range t.nodes { diff --git a/uint32_tree/tree_v4.go b/uint32_tree/tree_v4.go index b39df36..44acaf3 100644 --- a/uint32_tree/tree_v4.go +++ b/uint32_tree/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]uint32), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []uint32, address patricia.IPv4Addres } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/uint32_tree/tree_v4_manual.go b/uint32_tree/tree_v4_manual.go index d67cb9b..e8393f2 100644 --- a/uint32_tree/tree_v4_manual.go +++ b/uint32_tree/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]uint32, 0) for i := range t.nodes { diff --git a/uint32_tree/tree_v6_generated.go b/uint32_tree/tree_v6_generated.go index 7bb8a30..a8c1292 100644 --- a/uint32_tree/tree_v6_generated.go +++ b/uint32_tree/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]uint32), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []uint32, address patricia.IPv6Addres } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/uint32_tree/tree_v6_manual.go b/uint32_tree/tree_v6_manual.go index 76cb4fe..3c94519 100644 --- a/uint32_tree/tree_v6_manual.go +++ b/uint32_tree/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]uint32, 0) for i := range t.nodes { diff --git a/uint64_tree/tree_v4.go b/uint64_tree/tree_v4.go index eaa74c3..1b94bc3 100644 --- a/uint64_tree/tree_v4.go +++ b/uint64_tree/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]uint64), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []uint64, address patricia.IPv4Addres } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/uint64_tree/tree_v4_manual.go b/uint64_tree/tree_v4_manual.go index ff969f2..b7ce78a 100644 --- a/uint64_tree/tree_v4_manual.go +++ b/uint64_tree/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]uint64, 0) for i := range t.nodes { diff --git a/uint64_tree/tree_v6_generated.go b/uint64_tree/tree_v6_generated.go index ad7e9da..c429466 100644 --- a/uint64_tree/tree_v6_generated.go +++ b/uint64_tree/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]uint64), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []uint64, address patricia.IPv6Addres } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/uint64_tree/tree_v6_manual.go b/uint64_tree/tree_v6_manual.go index 3724d3e..3ecd7d6 100644 --- a/uint64_tree/tree_v6_manual.go +++ b/uint64_tree/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]uint64, 0) for i := range t.nodes { diff --git a/uint8_tree/tree_v4.go b/uint8_tree/tree_v4.go index 9399d43..2a2c9a5 100644 --- a/uint8_tree/tree_v4.go +++ b/uint8_tree/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]uint8), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []uint8, address patricia.IPv4Address } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/uint8_tree/tree_v4_manual.go b/uint8_tree/tree_v4_manual.go index 0251084..ff9d7da 100644 --- a/uint8_tree/tree_v4_manual.go +++ b/uint8_tree/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]uint8, 0) for i := range t.nodes { diff --git a/uint8_tree/tree_v6_generated.go b/uint8_tree/tree_v6_generated.go index 87a2fc7..8097e96 100644 --- a/uint8_tree/tree_v6_generated.go +++ b/uint8_tree/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]uint8), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []uint8, address patricia.IPv6Address } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/uint8_tree/tree_v6_manual.go b/uint8_tree/tree_v6_manual.go index ca42b3c..03ed63d 100644 --- a/uint8_tree/tree_v6_manual.go +++ b/uint8_tree/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]uint8, 0) for i := range t.nodes { diff --git a/uint_tree/tree_v4.go b/uint_tree/tree_v4.go index d2fa247..a7a1fd4 100644 --- a/uint_tree/tree_v4.go +++ b/uint_tree/tree_v4.go @@ -16,7 +16,7 @@ type TreeV4 struct { // NewTreeV4 returns a new Tree func NewTreeV4() *TreeV4 { return &TreeV4{ - nodes: make([]treeNodeV4, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV4, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]uint), } @@ -669,6 +669,7 @@ func (t *TreeV4) FindDeepestTagsAppend(ret []uint, address patricia.IPv4Address) } // note: this is only used for unit testing +//nolint func (t *TreeV4) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV4) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV4) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/uint_tree/tree_v4_manual.go b/uint_tree/tree_v4_manual.go index aff0bbf..73f7d95 100644 --- a/uint_tree/tree_v4_manual.go +++ b/uint_tree/tree_v4_manual.go @@ -22,6 +22,7 @@ func (t *TreeV4) newNode(address patricia.IPv4Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV4) print() { buf := make([]uint, 0) for i := range t.nodes { diff --git a/uint_tree/tree_v6_generated.go b/uint_tree/tree_v6_generated.go index 900f880..a0e7273 100644 --- a/uint_tree/tree_v6_generated.go +++ b/uint_tree/tree_v6_generated.go @@ -16,7 +16,7 @@ type TreeV6 struct { // NewTreeV6 returns a new Tree func NewTreeV6() *TreeV6 { return &TreeV6{ - nodes: make([]treeNodeV6, 2, 2), // index 0 is skipped, 1 is root + nodes: make([]treeNodeV6, 2), // index 0 is skipped, 1 is root availableIndexes: make([]uint, 0), tags: make(map[uint64]uint), } @@ -669,6 +669,7 @@ func (t *TreeV6) FindDeepestTagsAppend(ret []uint, address patricia.IPv6Address) } // note: this is only used for unit testing +//nolint func (t *TreeV6) countNodes(nodeIndex uint) int { nodeCount := 1 @@ -683,6 +684,7 @@ func (t *TreeV6) countNodes(nodeIndex uint) int { } // note: this is only used for unit testing +//nolint func (t *TreeV6) countTags(nodeIndex uint) int { node := &t.nodes[nodeIndex] diff --git a/uint_tree/tree_v6_manual.go b/uint_tree/tree_v6_manual.go index 1095ec5..a14e6b9 100644 --- a/uint_tree/tree_v6_manual.go +++ b/uint_tree/tree_v6_manual.go @@ -22,6 +22,7 @@ func (t *TreeV6) newNode(address patricia.IPv6Address, prefixLength uint) uint { return uint(len(t.nodes) - 1) } +//nolint func (t *TreeV6) print() { buf := make([]uint, 0) for i := range t.nodes {