pss: removed crypto/utils use directly ethereum/crypto to generate private keys in tests

Author: kortatu

pss/client/client_test.go

@@ -27,6 +27,7 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	ethCrypto "github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/p2p"
@@ -36,7 +37,6 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/ethersphere/swarm/network"
 	"github.com/ethersphere/swarm/pss"
-	"github.com/ethersphere/swarm/pss/crypto"
 	"github.com/ethersphere/swarm/state"
 )
 
@@ -49,7 +49,6 @@ type protoCtrl struct {
 var (
 	debugdebugflag = flag.Bool("vv", false, "veryverbose")
 	debugflag      = flag.Bool("v", false, "verbose")
-	utils          crypto.Utils
 	// custom logging
 	psslogmain   log.Logger
 	pssprotocols map[string]*protoCtrl
@@ -77,8 +76,6 @@ func init() {
 	h := log.CallerFileHandler(hf)
 	log.Root().SetHandler(h)
 
-	utils = crypto.NewUtils()
-
 	pssprotocols = make(map[string]*protoCtrl)
 }
 
@@ -246,11 +243,7 @@ func newServices() adapters.Services {
 	}
 	return adapters.Services{
 		"pss": func(ctx *adapters.ServiceContext) (node.Service, error) {
-			keys, err := utils.NewKeyPair()
-			if err != nil {
-				return nil, err
-			}
-			privkey, err := utils.GetPrivateKey(keys)
+			privkey, err := ethCrypto.GenerateKey()
 			if err != nil {
 				return nil, err
 			}

pss/crypto/utils.go

@@ -6,12 +6,12 @@ import (
 	"testing"
 	"time"
 
+	ethCrypto "github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/p2p/enode"
 	"github.com/ethersphere/swarm/network"
 	"github.com/ethersphere/swarm/p2p/protocols"
 	"github.com/ethersphere/swarm/pot"
-	"github.com/ethersphere/swarm/pss/crypto"
 )
 
 type testCase struct {
@@ -25,8 +25,6 @@ type testCase struct {
 	errors    string
 }
 
-var utils = crypto.NewUtils()
-
 // the purpose of this test is to see that pss.forward() function correctly
 // selects the peers for message forwarding, depending on the message address
 // and kademlia constellation.
@@ -325,7 +323,7 @@ func addPeers(kad *network.Kademlia, addresses []pot.Address) {
 }
 
 func createPss(t *testing.T, kad *network.Kademlia) *Pss {
-	privKey, err := utils.GenerateKey()
+	privKey, err := ethCrypto.GenerateKey()
 	pssp := NewParams().WithPrivateKey(privKey)
 	ps, err := New(kad, pssp)
 	if err != nil {

pss/forwarding_test.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	ethCrypto "github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/p2p/enode"
@@ -24,7 +25,6 @@ import (
 var (
 	loglevel = flag.Int("loglevel", 3, "logging verbosity")
 	psses    map[string]*pss.Pss
-	utils    crypto.Utils
 	crypt    crypto.Crypto
 )
 
@@ -36,7 +36,6 @@ func init() {
 	log.Root().SetHandler(h)
 
 	crypt = crypto.New()
-	utils = crypto.NewUtils()
 	psses = make(map[string]*pss.Pss)
 }
 
@@ -227,11 +226,7 @@ func newServices(allowRaw bool) adapters.Services {
 	}
 	return adapters.Services{
 		"pss": func(ctx *adapters.ServiceContext) (node.Service, error) {
-			keys, err := utils.NewKeyPair()
-			if err != nil {
-				return nil, err
-			}
-			privkey, err := utils.GetPrivateKey(keys)
+			privkey, err := ethCrypto.GenerateKey()
 			if err != nil {
 				return nil, err
 			}

pss/notify/notify_test.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	ethCrypto "github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/p2p"
@@ -425,9 +426,8 @@ func newProxServices(td *testData, allowRaw bool, handlerContextFuncs map[Topic]
 			// execadapter does not exec init()
 			initTest()
 
-			// create keys in cryptoUtils and set up the pss object
-			keys, err := cryptoUtils.NewKeyPair()
-			privkey, err := cryptoUtils.GetPrivateKey(keys)
+			// create keys and set up the pss object
+			privkey, err := ethCrypto.GenerateKey()
 			pssp := NewParams().WithPrivateKey(privkey)
 			pssp.AllowRaw = allowRaw
 			bzzPrivateKey, err := simulation.BzzPrivateKeyFromConfig(ctx.Config)