build: Bump golang to 1.17.9/Mac M1 Support (algorand#3919)

Eric-Warehime · web-flow · commit 4c4d9138b002 · 2022-05-09T20:13:20.000-04:00
Bump go version to 1.17.9
Also includes //+build =&gt; //go:build generated via make sanity
Fixed some data races discovered by 1.17 race detector
diff --git a/compactcert/msgp_gen_test.go b/compactcert/msgp_gen_test.go
diff --git a/merklearray/msgp_gen_test.go b/merklearray/msgp_gen_test.go
diff --git a/merklesignature/msgp_gen_test.go b/merklesignature/msgp_gen_test.go
diff --git a/msgp_gen_test.go b/msgp_gen_test.go
diff --git a/secp256k1/dummy.go b/secp256k1/dummy.go
@@ -1,3 +1,4 @@
+//go:build dummy
 // +build dummy
 
 // This file is part of a workaround for `go mod vendor` which won't vendor
diff --git a/secp256k1/libsecp256k1/contrib/dummy.go b/secp256k1/libsecp256k1/contrib/dummy.go
@@ -1,3 +1,4 @@
+//go:build dummy
 // +build dummy
 
 // Package c contains only a C file.
diff --git a/secp256k1/libsecp256k1/dummy.go b/secp256k1/libsecp256k1/dummy.go
@@ -1,3 +1,4 @@
+//go:build dummy
 // +build dummy
 
 // Package c contains only a C file.
diff --git a/secp256k1/libsecp256k1/include/dummy.go b/secp256k1/libsecp256k1/include/dummy.go
@@ -1,3 +1,4 @@
+//go:build dummy
 // +build dummy
 
 // Package c contains only a C file.
diff --git a/secp256k1/libsecp256k1/src/dummy.go b/secp256k1/libsecp256k1/src/dummy.go
@@ -1,3 +1,4 @@
+//go:build dummy
 // +build dummy
 
 // Package c contains only a C file.
diff --git a/secp256k1/libsecp256k1/src/modules/dummy.go b/secp256k1/libsecp256k1/src/modules/dummy.go
@@ -1,3 +1,4 @@
+//go:build dummy
 // +build dummy
 
 // Package c contains only a C file.
diff --git a/secp256k1/libsecp256k1/src/modules/ecdh/dummy.go b/secp256k1/libsecp256k1/src/modules/ecdh/dummy.go
@@ -1,3 +1,4 @@
+//go:build dummy
 // +build dummy
 
 // Package c contains only a C file.
diff --git a/secp256k1/libsecp256k1/src/modules/recovery/dummy.go b/secp256k1/libsecp256k1/src/modules/recovery/dummy.go
@@ -1,3 +1,4 @@
+//go:build dummy
 // +build dummy
 
 // Package c contains only a C file.
diff --git a/secp256k1/panic_cb.go b/secp256k1/panic_cb.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
-// +build !gofuzz
-// +build cgo
+//go:build !gofuzz && cgo
+// +build !gofuzz,cgo
 
 package secp256k1
 
diff --git a/secp256k1/scalar_mult_cgo.go b/secp256k1/scalar_mult_cgo.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
-// +build !gofuzz
-// +build cgo
+//go:build !gofuzz && cgo
+// +build !gofuzz,cgo
 
 package secp256k1
 
diff --git a/secp256k1/scalar_mult_nocgo.go b/secp256k1/scalar_mult_nocgo.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
+//go:build gofuzz || !cgo
 // +build gofuzz !cgo
 
 package secp256k1
diff --git a/secp256k1/secp256.go b/secp256k1/secp256.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
-// +build !gofuzz
-// +build cgo
+//go:build !gofuzz && cgo
+// +build !gofuzz,cgo
 
 // Package secp256k1 wraps the bitcoin secp256k1 C library.
 package secp256k1

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build dummy`
`1`	`2`	`// +build dummy`
`2`	`3`
`3`	`4`	// This file is part of a workaround for `go mod vendor` which won't vendor