Merge branch 'master' into uci/copy-templates

libp2p · Aug 18, 2023 · bd5ebb7 · bd5ebb7
2 parents 64764a1 + a2591e7
commit bd5ebb7
Show file tree

Hide file tree

Showing 79 changed files with 350 additions and 435 deletions.
diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml
@@ -17,4 +17,4 @@ jobs:
   go-test:
     uses: libp2p/uci/.github/workflows/[email protected]
     with:
-      go-versions: '["1.19.x", "1.20.x"]'
+      go-versions: '["1.20.x", "1.21.x"]'
diff --git a/core/crypto/ecdsa.go b/core/crypto/ecdsa.go
@@ -12,8 +12,7 @@ import (
 
 	pb "github.com/libp2p/go-libp2p/core/crypto/pb"
 	"github.com/libp2p/go-libp2p/core/internal/catch"
-
-	"github.com/minio/sha256-simd"
+	"github.com/libp2p/go-libp2p/internal/sha256"
 )
 
 // ECDSAPrivateKey is an implementation of an ECDSA private key

diff --git a/core/crypto/key_test.go b/core/crypto/key_test.go
@@ -16,10 +16,10 @@ import (
 	. "github.com/libp2p/go-libp2p/core/crypto"
 	pb "github.com/libp2p/go-libp2p/core/crypto/pb"
 	"github.com/libp2p/go-libp2p/core/test"
+	"github.com/libp2p/go-libp2p/internal/sha256"
 
 	"github.com/decred/dcrd/dcrec/secp256k1/v4"
 	secp256k1ecdsa "github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa"
-	"github.com/minio/sha256-simd"
 )
 
 func TestKeys(t *testing.T) {

diff --git a/core/crypto/rsa_go.go b/core/crypto/rsa_go.go
@@ -10,8 +10,7 @@ import (
 
 	pb "github.com/libp2p/go-libp2p/core/crypto/pb"
 	"github.com/libp2p/go-libp2p/core/internal/catch"
-
-	"github.com/minio/sha256-simd"
+	"github.com/libp2p/go-libp2p/internal/sha256"
 )
 
 // RsaPrivateKey is a rsa private key

diff --git a/core/crypto/secp256k1.go b/core/crypto/secp256k1.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/decred/dcrd/dcrec/secp256k1/v4"
 	"github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa"
-	"github.com/minio/sha256-simd"
+	"github.com/libp2p/go-libp2p/internal/sha256"
 )
 
 // Secp256k1PrivateKey is a Secp256k1 private key

diff --git a/examples/chat-with-mdns/flags.go b/examples/chat-with-mdns/flags.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/chat-with-mdns/main.go b/examples/chat-with-mdns/main.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/chat-with-mdns/mdns.go b/examples/chat-with-mdns/mdns.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/chat-with-rendezvous/chat.go b/examples/chat-with-rendezvous/chat.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/chat-with-rendezvous/flags.go b/examples/chat-with-rendezvous/flags.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/chat/chat.go b/examples/chat/chat.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 /*
  *
  * The MIT License (MIT)

diff --git a/examples/chat/chat_test.go b/examples/chat/chat_test.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/echo/main.go b/examples/echo/main.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/echo/main_test.go b/examples/echo/main_test.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/go_121_workaround_test.go b/examples/go_121_workaround_test.go
@@ -0,0 +1,8 @@
+//go:build go1.21
+
+package main
+
+import "testing"
+
+// Needed so that we run at least one test in Go 1.21 so that our go test command exits successfully
+func TestNothing(t *testing.T) {}
diff --git a/examples/http-proxy/proxy.go b/examples/http-proxy/proxy.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/ipfs-camp-2019/01-Transports/main.go b/examples/ipfs-camp-2019/01-Transports/main.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/ipfs-camp-2019/02-Multiaddrs/main.go b/examples/ipfs-camp-2019/02-Multiaddrs/main.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/ipfs-camp-2019/03-Muxing-Encryption/main.go b/examples/ipfs-camp-2019/03-Muxing-Encryption/main.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/ipfs-camp-2019/05-Discovery/main.go b/examples/ipfs-camp-2019/05-Discovery/main.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/ipfs-camp-2019/05-Discovery/protocol.go b/examples/ipfs-camp-2019/05-Discovery/protocol.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/ipfs-camp-2019/06-Pubsub/main.go b/examples/ipfs-camp-2019/06-Pubsub/main.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/ipfs-camp-2019/06-Pubsub/protocol.go b/examples/ipfs-camp-2019/06-Pubsub/protocol.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/ipfs-camp-2019/07-Messaging/chat.pb.go b/examples/ipfs-camp-2019/07-Messaging/chat.pb.go
diff --git a/examples/ipfs-camp-2019/07-Messaging/main.go b/examples/ipfs-camp-2019/07-Messaging/main.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/ipfs-camp-2019/07-Messaging/protocol.go b/examples/ipfs-camp-2019/07-Messaging/protocol.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/ipfs-camp-2019/07-Messaging/pubsub.go b/examples/ipfs-camp-2019/07-Messaging/pubsub.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/ipfs-camp-2019/08-End/chat.pb.go b/examples/ipfs-camp-2019/08-End/chat.pb.go
diff --git a/examples/ipfs-camp-2019/08-End/main.go b/examples/ipfs-camp-2019/08-End/main.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/ipfs-camp-2019/08-End/protocol.go b/examples/ipfs-camp-2019/08-End/protocol.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/ipfs-camp-2019/08-End/pubsub.go b/examples/ipfs-camp-2019/08-End/pubsub.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/ipfs-camp-2019/go_121_workaround_test.go b/examples/ipfs-camp-2019/go_121_workaround_test.go
@@ -0,0 +1,8 @@
+//go:build go1.21
+
+package main
+
+import "testing"
+
+// Needed so that we run at least one test in Go 1.21 so that our go test command exits successfully
+func TestNothing(t *testing.T) {}
diff --git a/examples/libp2p-host/host.go b/examples/libp2p-host/host.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/libp2p-host/host_test.go b/examples/libp2p-host/host_test.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/metrics-and-dashboards/main.go b/examples/metrics-and-dashboards/main.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/multipro/echo.go b/examples/multipro/echo.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/multipro/main.go b/examples/multipro/main.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/multipro/main_test.go b/examples/multipro/main_test.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/multipro/node.go b/examples/multipro/node.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/multipro/pb/p2p.pb.go b/examples/multipro/pb/p2p.pb.go
diff --git a/examples/multipro/ping.go b/examples/multipro/ping.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/pubsub/basic-chat-with-rendezvous/go_121_workaround_test.go b/examples/pubsub/basic-chat-with-rendezvous/go_121_workaround_test.go
@@ -0,0 +1,8 @@
+//go:build go1.21
+
+package main
+
+import "testing"
+
+// Needed so that we run at least one test in Go 1.21 so that our go test command exits successfully
+func TestNothing(t *testing.T) {}
diff --git a/examples/pubsub/basic-chat-with-rendezvous/main.go b/examples/pubsub/basic-chat-with-rendezvous/main.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/pubsub/chat/chatroom.go b/examples/pubsub/chat/chatroom.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/pubsub/chat/go_121_workaround_test.go b/examples/pubsub/chat/go_121_workaround_test.go
@@ -0,0 +1,8 @@
+//go:build go1.21
+
+package main
+
+import "testing"
+
+// Needed so that we run at least one test in Go 1.21 so that our go test command exits successfully
+func TestNothing(t *testing.T) {}
diff --git a/examples/pubsub/chat/main.go b/examples/pubsub/chat/main.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/pubsub/chat/ui.go b/examples/pubsub/chat/ui.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/relay/main.go b/examples/relay/main.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/relay/main_test.go b/examples/relay/main_test.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/routed-echo/bootstrap.go b/examples/routed-echo/bootstrap.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/routed-echo/main.go b/examples/routed-echo/main.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package main
 
 import (

diff --git a/examples/testutils/logharness.go b/examples/testutils/logharness.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package testutils
 
 import (

diff --git a/examples/testutils/net.go b/examples/testutils/net.go
@@ -1,3 +1,5 @@
+//go:build !go1.21
+
 package testutils
 
 import (

diff --git a/go.mod b/go.mod
@@ -25,7 +25,6 @@ require (
 	github.com/libp2p/go-flow-metrics v0.1.0
 	github.com/libp2p/go-libp2p-asn-util v0.3.0
 	github.com/libp2p/go-libp2p-testing v0.12.0
-	github.com/libp2p/go-mplex v0.7.0
 	github.com/libp2p/go-msgio v0.3.0
 	github.com/libp2p/go-nat v0.2.0
 	github.com/libp2p/go-netroute v0.2.1
@@ -48,7 +47,7 @@ require (
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
 	github.com/prometheus/client_golang v1.14.0
 	github.com/prometheus/client_model v0.4.0
-	github.com/quic-go/quic-go v0.36.3
+	github.com/quic-go/quic-go v0.37.5
 	github.com/quic-go/webtransport-go v0.5.3
 	github.com/raulk/go-watchdog v1.3.0
 	github.com/stretchr/testify v1.8.4
@@ -103,8 +102,7 @@ require (
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
-	github.com/quic-go/qtls-go1-19 v0.3.3 // indirect
-	github.com/quic-go/qtls-go1-20 v0.2.3 // indirect
+	github.com/quic-go/qtls-go1-20 v0.3.1 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/syndtr/goleveldb v1.0.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect

diff --git a/go.sum b/go.sum
@@ -299,8 +299,6 @@ github.com/libp2p/go-libp2p-asn-util v0.3.0 h1:gMDcMyYiZKkocGXDQ5nsUQyquC9+H+iLE
 github.com/libp2p/go-libp2p-asn-util v0.3.0/go.mod h1:B1mcOrKUE35Xq/ASTmQ4tN3LNzVVaMNmq2NACuqyB9w=
 github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA=
 github.com/libp2p/go-libp2p-testing v0.12.0/go.mod h1:KcGDRXyN7sQCllucn1cOOS+Dmm7ujhfEyXQL5lvkcPg=
-github.com/libp2p/go-mplex v0.7.0 h1:BDhFZdlk5tbr0oyFq/xv/NPGfjbnrsDam1EvutpBDbY=
-github.com/libp2p/go-mplex v0.7.0/go.mod h1:rW8ThnRcYWft/Jb2jeORBmPd6xuG3dGxWN/W168L9EU=
 github.com/libp2p/go-msgio v0.3.0 h1:mf3Z8B1xcFN314sWX+2vOTShIE0Mmn2TXn3YCUQGNj0=
 github.com/libp2p/go-msgio v0.3.0/go.mod h1:nyRM819GmVaF9LX3l03RMh10QdOroF++NBbxAb0mmDM=
 github.com/libp2p/go-nat v0.2.0 h1:Tyz+bUFAYqGyJ/ppPPymMGbIgNRH+WqC5QrT5fKrrGk=
@@ -434,12 +432,10 @@ github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5
 github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
-github.com/quic-go/qtls-go1-19 v0.3.3 h1:wznEHvJwd+2X3PqftRha0SUKmGsnb6dfArMhy9PeJVE=
-github.com/quic-go/qtls-go1-19 v0.3.3/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
-github.com/quic-go/qtls-go1-20 v0.2.3 h1:m575dovXn1y2ATOb1XrRFcrv0F+EQmlowTkoraNkDPI=
-github.com/quic-go/qtls-go1-20 v0.2.3/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
-github.com/quic-go/quic-go v0.36.3 h1:f+yOqeGhMoRX7/M3wmEw/djhzKWr15FtQysox85/834=
-github.com/quic-go/quic-go v0.36.3/go.mod h1:qxQumdeKw5GmWs1OsTZZnOxzSI+RJWuhf1O8FN35L2o=
+github.com/quic-go/qtls-go1-20 v0.3.1 h1:O4BLOM3hwfVF3AcktIylQXyl7Yi2iBNVy5QsV+ySxbg=
+github.com/quic-go/qtls-go1-20 v0.3.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
+github.com/quic-go/quic-go v0.37.5 h1:pzkYe8AgaxHi+7KJrYBMF+u2rLO5a9kwyCp2dAsljzk=
+github.com/quic-go/quic-go v0.37.5/go.mod h1:YsbH1r4mSHPJcLF4k4zruUkLBqctEMBDR6VPvcYjIsU=
 github.com/quic-go/webtransport-go v0.5.3 h1:5XMlzemqB4qmOlgIus5zB45AcZ2kCgCy2EptUrfOPWU=
 github.com/quic-go/webtransport-go v0.5.3/go.mod h1:OhmmgJIzTTqXK5xvtuX0oBpLV2GkLWNDA+UeTGJXErU=
 github.com/raulk/go-watchdog v1.3.0 h1:oUmdlHxdkXRJlwfG0O9omj8ukerm8MEQavSiDTEtBsk=