bump go-libp2p v0.25.1 and kubo v0.19.0-rc1 (supports go 1.20)

* go get github.com/libp2p/go-libp2p@latest * go get github.com/ipfs/[email protected] * go mod tidy Import path changes: * github.com/libp2p/go-libp2p-core -> github.com/libp2p/go-libp2p/core * github.com/libp2p/go-libp2p-connmgr -> github.com/libp2p/go-libp2p/p2p/net/connmgr * github.com/ipfs/go-ipfs-files -> github.com/ipfs/go-libipfs/files Code changes: * ipfs: config.NewOptionalInteger() and config.NewOptionalDuration() * ipfsconnect/subpub: connmanager.WithGracePeriod(time.Second*10)) * ipfsconnect/subpub: c.Apply(libp2p.Defaults) * ipfsconnect/subpub: disable TestSubPub until fixed * util/net_test: fix go vet warning * api/autoswag: fix gofmt issue * all: rand.Seed() no longer needed in go v1.20 according to https://tip.golang.org/doc/go1.20#math/rand The math/rand package now automatically seeds the global random number generator with a random value, and the top-level Seed function has been deprecated * benchmark/vochain: fix 'this value of processID is never used' * rpcclient/util: use crypto/rand.Int instead of deprecated math/rand.Intn
vocdoni · Mar 9, 2023 · 9ad87e2 · 9ad87e2
1 parent 12babfb
commit 9ad87e2
Show file tree

Hide file tree

Showing 20 changed files with 330 additions and 714 deletions.
diff --git a/api/autoswag/main.go b/api/autoswag/main.go
@@ -172,7 +172,7 @@ func UpdateRouterTags(fset *token.FileSet, parsedFile *ast.File, fmap map[string
 
 				for _, pm := range pms {
 					line := &ast.Comment{
-						Text:  fmt.Sprintf(`//	@Router %s [%s]`, pm.path, pm.method),
+						Text:  fmt.Sprintf("//\t@Router %s [%s]", pm.path, pm.method),
 						Slash: token.Pos(int(x.Pos() - 1)),
 					}
 					list = append(list, line)

diff --git a/benchmark/api_benchmark_test.go b/benchmark/api_benchmark_test.go
@@ -3,9 +3,7 @@ package test
 import (
 	"flag"
 	"fmt"
-	"math/rand"
 	"testing"
-	"time"
 
 	"go.vocdoni.io/dvote/crypto/ethereum"
 	"go.vocdoni.io/dvote/log"
@@ -17,10 +15,6 @@ import (
 	"go.vocdoni.io/dvote/test/testcommon"
 )
 
-// The init function and flags are shared with the other benchmark files.
-// These globals can only be read, not modified.
-func init() { rand.Seed(time.Now().UnixNano()) }
-
 var (
 	hostFlag   = flag.String("host", "", "alternative host to run against, e.g. ws[s]://<HOST>[:9090]/dvote)")
 	censusSize = flag.Int("censusSize", 100, "number of census entries to add (minimum 100)")

diff --git a/benchmark/vochain_benchmark_test.go b/benchmark/vochain_benchmark_test.go
@@ -12,7 +12,6 @@ import (
 	client "go.vocdoni.io/dvote/rpcclient"
 	api "go.vocdoni.io/dvote/rpctypes"
 	"go.vocdoni.io/dvote/test/testcommon"
-	"go.vocdoni.io/dvote/test/testcommon/testutil"
 	"go.vocdoni.io/dvote/types"
 	"go.vocdoni.io/dvote/util"
 	"go.vocdoni.io/dvote/vochain"
@@ -47,7 +46,6 @@ func BenchmarkVochainBatchProof(b *testing.B) {
 
 	// setup the basic parties
 	entityID := dvoteServer.Signer.Address().Bytes()
-	processID := testutil.Hex2byte(b, hexProcessID)
 
 	// create census and process
 	censusRoot, _, processID := createCensusAndProcess(b, cl, dvoteServer, keySet, entityID)
@@ -103,7 +101,6 @@ func BenchmarkVochainSingleProof(b *testing.B) {
 
 	// setup the basic parties
 	entityID := dvoteServer.Signer.Address().Bytes()
-	processID := testutil.Hex2byte(b, hexProcessID)
 
 	// create census and process
 	censusRoot, _, processID := createCensusAndProcess(b, cl, dvoteServer, keySet, entityID)

diff --git a/benchmark/zk_census_benchmark_test.go b/benchmark/zk_census_benchmark_test.go
@@ -5,11 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 	"math/big"
-	"math/rand"
 	"net/url"
 	"path"
 	"testing"
-	"time"
 
 	qt "github.com/frankban/quicktest"
 	"github.com/google/uuid"
@@ -29,8 +27,6 @@ import (
 	"go.vocdoni.io/dvote/vochain"
 )
 
-func init() { rand.Seed(time.Now().UnixNano()) }
-
 var zkCircuitTest = circuit.CircuitsConfigurations["dev"]
 
 // go test -v -run=- -bench=BenchmarkZkCensus -benchmem -count=100 .

diff --git a/cmd/end2endtest/main.go b/cmd/end2endtest/main.go
@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
-	"math/rand"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -122,8 +121,6 @@ func main() {
 	log.Init(c.logLevel, "stdout")
 	log.Infow("starting "+filepath.Base(os.Args[0]), "version", internal.Version)
 
-	rand.Seed(time.Now().UnixNano())
-
 	if len(c.accountPrivKeys) == 0 {
 		c.accountPrivKeys = []string{util.RandomHex(32)}
 		log.Infof("no keys passed, generated random private key: %s", c.accountPrivKeys)

diff --git a/cmd/vochaintest/vochaintest.go b/cmd/vochaintest/vochaintest.go
@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"math/rand"
 	"os"
 	"path/filepath"
 	"strings"
@@ -112,8 +111,6 @@ func main() {
 	log.Init(*loglevel, "stdout")
 	log.Infow("starting "+filepath.Base(os.Args[0]), "version", internal.Version)
 
-	rand.Seed(time.Now().UnixNano())
-
 	accountKeys := make([]*ethereum.SignKeys, len(*accountPrivKeys))
 	for i, key := range *accountPrivKeys {
 		ak, err := privKeyToSigner(key)

diff --git a/data/ipfs.go b/data/ipfs.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	ipfscid "github.com/ipfs/go-cid"
-	files "github.com/ipfs/go-ipfs-files"
 	keystore "github.com/ipfs/go-ipfs-keystore"
+	files "github.com/ipfs/go-libipfs/files"
 	ipfslog "github.com/ipfs/go-log"
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/ipfs/interface-go-ipfs-core/options"
@@ -19,7 +19,7 @@ import (
 	"github.com/ipfs/kubo/core/corehttp"
 	"github.com/ipfs/kubo/core/corerepo"
 	"github.com/ipfs/kubo/repo/fsrepo"
-	ipfscrypto "github.com/libp2p/go-libp2p-core/crypto"
+	ipfscrypto "github.com/libp2p/go-libp2p/core/crypto"
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr/net"
 	"github.com/multiformats/go-multicodec"