From 684d791f4a72c6b904ad0427bcb193c8fb3728ee Mon Sep 17 00:00:00 2001
From: Sydney Anne Erickson <sydney@elixxir.io>
Date: Mon, 8 Mar 2021 11:52:05 -0800
Subject: [PATCH] Reverse some changes
---
api/client.go | 10 ++++++++--
network/manager.go | 2 +-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/api/client.go b/api/client.go
index 962976cc8..31a81017e 100644
--- a/api/client.go
+++ b/api/client.go
@@ -235,7 +235,7 @@ func Login(storageDir string, password []byte, parameters params.Network) (*Clie
// Initialize network and link it to context
c.network, err = network.NewManager(c.storage, c.switchboard, c.rng, c.comms,
- parameters, def, SEMVER)
+ parameters, def)
if err != nil {
return nil, err
}
@@ -298,7 +298,7 @@ func LoginWithNewBaseNDF_UNSAFE(storageDir string, password []byte,
// Initialize network and link it to context
c.network, err = network.NewManager(c.storage, c.switchboard, c.rng, c.comms,
- parameters, def, SEMVER)
+ parameters, def)
if err != nil {
return nil, err
}
@@ -335,6 +335,12 @@ func (c *Client) initComms() error {
func (c *Client) initPermissioning(def *ndf.NetworkDefinition) error {
var err error
+ //initialize permissioning
+ c.permissioning, err = permissioning.Init(c.comms, def)
+ if err != nil {
+ return errors.WithMessage(err, "failed to init "+
+ "permissioning handler")
+ }
//register with permissioning if necessary
if c.storage.GetRegistrationStatus() == storage.KeyGenComplete {
diff --git a/network/manager.go b/network/manager.go
index db3dcb79a..8e929f2e9 100644
--- a/network/manager.go
+++ b/network/manager.go
@@ -56,7 +56,7 @@ type manager struct {
// NewManager builds a new reception manager object using inputted key fields
func NewManager(session *storage.Session, switchboard *switchboard.Switchboard,
rng *fastRNG.StreamGenerator, comms *client.Comms,
- params params.Network, ndf *ndf.NetworkDefinition, clientVersion string) (interfaces.NetworkManager, error) {
+ params params.Network, ndf *ndf.NetworkDefinition) (interfaces.NetworkManager, error) {
//start network instance
instance, err := network.NewInstance(comms.ProtoComms, ndf, nil, nil)
--
GitLab