Use go:build lines and remove obsolete +build lines (#4175)

accounts/abi/bind/bind_test.go

@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build integration
-// +build integration
 
 package bind
 

common/fdlimit/fdlimit_bsd.go

@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build freebsd || dragonfly
-// +build freebsd dragonfly
 
 package fdlimit
 

common/fdlimit/fdlimit_unix.go

@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build linux || netbsd || openbsd || solaris
-// +build linux netbsd openbsd solaris
 
 package fdlimit
 

core/mkalloc.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-// +build none
+//go:build none
 
 /*
 

core/state/intra_block_state_test.go

@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build integration
-// +build integration
 
 package state
 

core/types/receipt_codecgen_gen.go

@@ -1,5 +1,4 @@
 //go:build go1.6
-// +build go1.6
 
 // Code generated by codecgen - DO NOT EDIT.
 

crypto/blake2b/blake2bAVX2_amd64.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.7 && amd64 && !gccgo && !appengine
-// +build go1.7,amd64,!gccgo,!appengine
 
 package blake2b
 

crypto/blake2b/blake2b_amd64.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !go1.7,amd64,!gccgo,!appengine
+//go:build !go1.7 && amd64 && !gccgo && !appengine
 
 package blake2b
 

crypto/blake2b/blake2b_f_fuzz.go

@@ -1,4 +1,4 @@
-// +build gofuzz
+//go:build gofuzz
 
 package blake2b
 

crypto/blake2b/blake2b_ref.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !amd64 || appengine || gccgo
-// +build !amd64 appengine gccgo
 
 package blake2b
 

crypto/blake2b/register.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.9
-// +build go1.9
 
 package blake2b
 

crypto/bls12381/arithmetic_decl.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-// +build amd64,blsasm amd64,blsadx
+//go:build (amd64 && blsasm) || (amd64 && blsadx)
 
 package bls12381
 

crypto/bls12381/arithmetic_fallback.go

@@ -31,7 +31,7 @@
 
 // Package bls (generated by goff) contains field arithmetics operations
 
-// +build !amd64 !blsasm,!blsadx
+//go:build !amd64 || (!blsasm && !blsadx)
 
 package bls12381
 

crypto/bls12381/arithmetic_x86_adx.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-// +build amd64,blsadx
+//go:build amd64 && blsadx
 
 package bls12381
 

crypto/bls12381/arithmetic_x86_noadx.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-// +build amd64,blsasm
+//go:build amd64 && blsasm
 
 package bls12381
 

crypto/bn256/bn256_fast.go

@@ -3,7 +3,6 @@
 // in the LICENSE file.
 
 //go:build amd64 || arm64
-// +build amd64 arm64
 
 // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve.
 package bn256

crypto/bn256/bn256_slow.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be found
 // in the LICENSE file.
 
-// +build !amd64,!arm64
+//go:build !amd64 && !arm64
 
 // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve.
 package bn256

crypto/bn256/cloudflare/gfp_decl.go

@@ -1,5 +1,4 @@
 //go:build (amd64 && !generic) || (arm64 && !generic)
-// +build amd64,!generic arm64,!generic
 
 package bn256
 

crypto/bn256/cloudflare/gfp_generic.go

@@ -1,4 +1,4 @@
-// +build !amd64,!arm64 generic
+//go:build (!amd64 && !arm64) || generic
 
 package bn256
 

crypto/signature_cgo.go

@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !nacl && !js && cgo && !gofuzz
-// +build !nacl,!js,cgo,!gofuzz
 
 package crypto
 

crypto/signature_nocgo.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-// +build nacl js !cgo gofuzz
+//go:build nacl || js || !cgo || gofuzz
 
 package crypto
 

ethdb/olddb/database_test.go

@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !js
-// +build !js
 
 package olddb
 

internal/debug/loudpanic.go

@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build go1.6
-// +build go1.6
 
 package debug
 

internal/debug/loudpanic_fallback.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-// +build !go1.6
+//go:build !go1.6
 
 package debug
 

internal/debug/signal.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package debug
 

internal/debug/signal_windows.go

@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package debug
 

internal/debug/trace.go

@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build go1.5
-// +build go1.5
 
 package debug
 

internal/debug/trace_fallback.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-//+build !go1.5
+//go:build !go1.5
 
 // no-op implementation of tracing methods for Go < 1.5.
 

p2p/dial_integration_test.go

@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package p2p
 

p2p/discover/table_integration_test.go

@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package discover
 

p2p/discover/v4_lookup_test.go

@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build integration
-// +build integration
 
 package discover
 

p2p/discover/v5_lookup_test.go

@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package discover
 

p2p/discover/v5_udp_integration_test.go

@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package discover
 

p2p/enode/iter_integration_test.go

@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package enode
 

p2p/nat/natupnp_test.go

@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build integration
-// +build integration
 
 package nat
 

p2p/netutil/toobig_notwindows.go

@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build !windows
-// +build !windows
 
 package netutil
 

p2p/netutil/toobig_windows.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-//+build windows
+//go:build windows
 
 package netutil
 

rules.go

@@ -1,5 +1,4 @@
 //go:build gorules
-// +build gorules
 
 package gorules
 

tests/block_test.go

@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build integration
-// +build integration
 
 package tests
 

tests/difficulty_test.go

@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build integration
-// +build integration
 
 package tests
 

tests/fuzzers/bls12381/bls12381_fuzz.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-// +build gofuzz
+//go:build gofuzz
 
 package bls
 

tests/init_test.go

@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build integration
-// +build integration
 
 package tests
 

tests/rlp_test.go

@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build integration
-// +build integration
 
 package tests
 

tests/state_test.go

@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build integration
-// +build integration
 
 package tests
 

tests/transaction_test.go

@@ -15,7 +15,6 @@
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
 //go:build integration
-// +build integration
 
 package tests
 

tools.go

@@ -1,5 +1,4 @@
 //go:build tools
-// +build tools
 
 package tools
 

turbo/rlphacks/bytes_test.go

@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package rlphacks