pr review changes

Author: kortatu

pss/client/client_test.go

@@ -21,7 +21,6 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"github.com/ethersphere/swarm/pss/crypto"
 	"math/rand"
 	"os"
 	"testing"
@@ -37,6 +36,7 @@ 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"
 )
 

pss/notify/notify_test.go

@@ -5,28 +5,26 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	crypto2 "github.com/ethersphere/swarm/pss/crypto"
 	"os"
 	"testing"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common/hexutil"
-
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/p2p/enode"
 	"github.com/ethereum/go-ethereum/p2p/simulations"
 	"github.com/ethereum/go-ethereum/p2p/simulations/adapters"
 	"github.com/ethersphere/swarm/network"
 	"github.com/ethersphere/swarm/pss"
+	"github.com/ethersphere/swarm/pss/crypto"
 	"github.com/ethersphere/swarm/state"
 )
 
 var (
-	loglevel    = flag.Int("loglevel", 3, "logging verbosity")
-	psses       map[string]*pss.Pss
-	cryptoUtils crypto2.CryptoUtils
-	crypto      crypto2.CryptoBackend
+	loglevel = flag.Int("loglevel", 3, "logging verbosity")
+	psses    map[string]*pss.Pss
+	cryptoB  crypto.Crypto
 )
 
 func init() {
@@ -36,8 +34,7 @@ func init() {
 	h := log.CallerFileHandler(hf)
 	log.Root().SetHandler(h)
 
-	cryptoUtils = crypto2.NewCryptoUtils()
-	crypto = pss.NewCryptoBackend()
+	cryptoB = crypto.New()
 	psses = make(map[string]*pss.Pss)
 }
 
@@ -138,7 +135,7 @@ func TestStart(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	pubkey, err := crypto.UnmarshalPubkey(pubkeybytes)
+	pubkey, err := cryptoB.UnmarshalPubkey(pubkeybytes)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -230,11 +227,11 @@ func newServices(allowRaw bool) adapters.Services {
 		"pss": func(ctx *adapters.ServiceContext) (node.Service, error) {
 			ctxlocal, cancel := context.WithTimeout(context.Background(), time.Second)
 			defer cancel()
-			keys, err := cryptoUtils.NewKeyPair(ctxlocal)
+			keys, err := cryptoB.NewKeyPair(ctxlocal)
 			if err != nil {
 				return nil, err
 			}
-			privkey, err := cryptoUtils.GetPrivateKey(keys)
+			privkey, err := cryptoB.GetPrivateKey(keys)
 			if err != nil {
 				return nil, err
 			}
@@ -246,7 +243,7 @@ func newServices(allowRaw bool) adapters.Services {
 			if err != nil {
 				return nil, err
 			}
-			psses[hexutil.Encode(crypto.FromECDSAPub(&privkey.PublicKey))] = ps
+			psses[hexutil.Encode(cryptoB.FromECDSAPub(&privkey.PublicKey))] = ps
 			return ps, nil
 		},
 		"bzz": func(ctx *adapters.ServiceContext) (node.Service, error) {

pss/types.go

@@ -228,7 +228,7 @@ func BytesToTopic(b []byte) Topic {
 	return toTopic(topicHashFunc.Sum(nil))
 }
 
-// BytesToTopic converts from the byte array representation of a topic
+// toTopic converts from the byte array representation of a topic
 // into the TopicType type.
 func toTopic(b []byte) (t Topic) {
 	sz := TopicLength