Merge pull request #172 from maxmind/wstorey/fix-lints

Fix lints

Author: oschwald

data_section.go

@@ -49,7 +49,6 @@ func (dw *dataWriter) maybeWrite(value *dataMapValue) (int, error) {
 	}
 
 	written = writtenType{
-		//nolint:gosec // checked above
 		pointer: mmdbtype.Pointer(offset),
 		size:    size,
 	}
@@ -97,7 +96,6 @@ func (dw *dataWriter) WriteOrWritePointer(t mmdbtype.DataType) (int64, error) {
 	}
 
 	dw.offsets[key] = writtenType{
-		//nolint:gosec // checked above
 		pointer: mmdbtype.Pointer(offset),
 		size:    size,
 	}

mmdbtype/types.go

@@ -258,7 +258,6 @@ func (t Int32) Equal(other DataType) bool {
 }
 
 func (t Int32) size() int {
-	//nolint:gosec // this is correct.
 	return 4 - bits.LeadingZeros32(uint32(t))/8
 }
 

mmdbtype/types_test.go

@@ -212,7 +212,6 @@ func TestUint128(t *testing.T) {
 	for i := 1; i <= bits/8; i++ {
 		expected := &big.Int{}
 
-		//nolint:gosec // i is positive.
 		expected.Lsh(big.NewInt(1), 8*uint(i))
 		expected = expected.Sub(expected, big.NewInt(1))
 		input := hex.EncodeToString([]byte{byte(i)}) + ctrlByte + strings.Repeat("ff", i)

tree.go

@@ -196,7 +196,6 @@ func Load(path string, opts Options) (*Tree, error) {
 	}
 
 	if opts.IPVersion == 0 {
-		//nolint:gosec // no risk. Will be 4 or 6.
 		opts.IPVersion = int(metadata.IPVersion)
 	}
 
@@ -205,7 +204,6 @@ func Load(path string, opts Options) (*Tree, error) {
 	}
 
 	if opts.RecordSize == 0 {
-		//nolint:gosec // no risk. Will be 24, 28, or 32.
 		opts.RecordSize = int(metadata.RecordSize)
 	}
 
@@ -653,17 +651,13 @@ func (t *Tree) writeMetadata(dw *dataWriter) (int64, error) {
 
 		// Although it might make sense to change the type on this, there is no use
 		// case where someone would reasonably pass a negative build epoch.
-		//nolint:gosec // See above.
 		"build_epoch":   mmdbtype.Uint64(t.buildEpoch),
 		"database_type": mmdbtype.String(t.databaseType),
 		"description":   description,
-		//nolint:gosec // no risk. Will be 4 or 6.
-		"ip_version": mmdbtype.Uint16(t.ipVersion),
-		"languages":  languages,
-		//nolint:gosec // checked above
-		"node_count": mmdbtype.Uint32(t.nodeCount),
-		//nolint:gosec // no risk. Will be 24, 28, or 32.
-		"record_size": mmdbtype.Uint16(t.recordSize),
+		"ip_version":    mmdbtype.Uint16(t.ipVersion),
+		"languages":     languages,
+		"node_count":    mmdbtype.Uint32(t.nodeCount),
+		"record_size":   mmdbtype.Uint16(t.recordSize),
 	}
 	return metadata.WriteTo(dw)
 }