diff --git a/api/client.go b/api/client.go
index 62ffb175be50ce5dafdbc3d12ba8ca8ea2c8073f..bedc02b12e888ac8fc6c3e2b34abecf6ca828128 100644
--- a/api/client.go
+++ b/api/client.go
@@ -168,8 +168,6 @@ func (cl *Client) Login(password string) (*id.ID, error) {
}
cl.sessionV2 = io.SessionV2
- // fixme fully remove the below
- //if session.GetRegState() < user.KeyGenComplete {
regState, err := io.SessionV2.GetRegState()
if err != nil {
return nil, errors.Wrap(err, "Login: Could not login")
diff --git a/api/register.go b/api/register.go
index 02d68e04c5b9c606cc0da469f53d8dbb847781c6..58da6a06cf177189224dff1eb49ef8caf803a17f 100644
--- a/api/register.go
+++ b/api/register.go
@@ -31,8 +31,6 @@ const SaltSize = 32
// Returns an error if registration fails.
func (cl *Client) RegisterWithPermissioning(preCan bool, registrationCode string) (*id.ID, error) {
//Check the regState is in proper state for registration
- // fixme fully remove the below
- //if cl.session.GetRegState() != user.KeyGenComplete {
regState, err := io.SessionV2.GetRegState()
if err != nil {
return nil, err
@@ -71,11 +69,6 @@ func (cl *Client) RegisterWithPermissioning(preCan bool, registrationCode string
if err != nil {
return &id.ZeroUser, err
}
- // fixme fully remove the below
- //err := cl.session.SetRegState(user.PermissioningComplete)
- //if err != nil {
- // return nil, errors.Wrap(err, "Could not do precanned registration")
- //}
} else {
// Or register with the permissioning server and generate user information
@@ -94,8 +87,6 @@ func (cl *Client) RegisterWithPermissioning(preCan bool, registrationCode string
if err != nil {
return nil, err
}
- // fixme fully remove the below
- //err = cl.session.RegisterPermissioningSignature(regValidationSignature)
}
@@ -116,9 +107,6 @@ func (cl *Client) RegisterWithPermissioning(preCan bool, registrationCode string
// User discovery. Must be called after Register and InitNetwork.
// It will fail if the user has already registered with UDB
func (cl *Client) RegisterWithUDB(username string, timeout time.Duration) error {
- // fixme fully remove the below
-
- //regState := cl.GetSession().GetRegState()
regState, err := io.SessionV2.GetRegState()
if err != nil {
return err
@@ -152,9 +140,6 @@ func (cl *Client) RegisterWithUDB(username string, timeout time.Duration) error
//set the registration state
err = io.SessionV2.SetRegState(user.UDBComplete)
- // fixme fully remove the below
- //err = cl.session.SetRegState(user.UDBComplete)
-
if err != nil {
return errors.Wrap(err, "UDB Registration Failed")
}
diff --git a/cmd/root.go b/cmd/root.go
index 49d072cafb231b23f5ca29da3669b5c9e21b9ffd..29cc6a8f89b02464ccd5a4bd81376faab3dca691 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -442,9 +442,6 @@ var rootCmd = &cobra.Command{
// todo: since this is in the root cmd, would checking the regstate directly really be bad?
// It's correct that it should be an error state for RegisterWithUDB, however for this, it's start up code
- // fixme fully remove the below
- //if username != "" && client.GetSession().GetRegState() == user.PermissioningComplete {
-
regState, err := io.SessionV2.GetRegState()
if err != nil {
globals.Log.FATAL.Panicf("Could not retrieve registration state: %v", err)
diff --git a/go.mod b/go.mod
index 02a7a34737a3d0ef3fa7cd400f9e46016bebd9a7..81745aa552991a12b97082425d9ace2a23156141 100644
--- a/go.mod
+++ b/go.mod
@@ -15,11 +15,12 @@ require (
github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.6.2
- gitlab.com/elixxir/comms v0.0.0-20200803223713-26b69d6adff9
- gitlab.com/elixxir/crypto v0.0.0-20200803223738-661ca14b6470
+ gitlab.com/elixxir/comms v0.0.0-20200805174832-240bba97beaa
+ gitlab.com/elixxir/crypto v0.0.0-20200805174804-bdf909f2a16d
gitlab.com/elixxir/ekv v0.1.0
- gitlab.com/elixxir/primitives v0.0.0-20200731184040-494269b53b4d
- gitlab.com/xx_network/comms v0.0.0-20200803203304-a7a1c5e4239d
+ gitlab.com/elixxir/primitives v0.0.0-20200805174810-86b366d1dd2d
+ gitlab.com/xx_network/collections/ring v0.0.0-00010101000000-000000000000 // indirect
+ gitlab.com/xx_network/comms v0.0.0-20200805174823-841427dd5023
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642 // indirect
gopkg.in/ini.v1 v1.52.0 // indirect
diff --git a/go.sum b/go.sum
index c9189bcbdf590bdc80400c5ba85e43cc3e3d1eba..644a0032afc3ebd6db4bead557c79ec197dca111 100644
--- a/go.sum
+++ b/go.sum
@@ -164,12 +164,17 @@ github.com/zeebo/pcg v0.0.0-20181207190024-3cdc6b625a05/go.mod h1:Gr+78ptB0MwXxm
gitlab.com/elixxir/comms v0.0.0-20200707210150-b8ebd0951d23/go.mod h1:OsWMZ1O/R9fOkm+PoHnR3rkXfFtipGoPs73FuKuurHY=
gitlab.com/elixxir/comms v0.0.0-20200803223713-26b69d6adff9 h1:CqlisVYRzrOnGcGy0ER8dfRT7qIKUeD7vPQ8Jl3W08g=
gitlab.com/elixxir/comms v0.0.0-20200803223713-26b69d6adff9/go.mod h1:JLUr1981dSoxSDgOKCDPrf9d+SSYexGm6iKFoZiRZ/M=
+gitlab.com/elixxir/comms v0.0.0-20200805174832-240bba97beaa h1:yn5FW/zPPKb0DYbN1HvhudYkCrXhpBK4CrZGeUKCGu4=
+gitlab.com/elixxir/comms v0.0.0-20200805174832-240bba97beaa/go.mod h1:Wc6fZyP/M4sBjnzb9pRScLeqwMOCv6DRXoTOd07bO3g=
gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930 h1:9qzfwyR12OYgn3j30qcHZHHVfWshWnH54lcAHppEROQ=
gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930/go.mod h1:LHBAaEf48a0/AjU118rjoworH0LgXifhAqmNX3ZRvME=
gitlab.com/elixxir/crypto v0.0.0-20200721213839-b026955c55c0 h1:bXpAX607nE2edN7ei8CIAcHuD0kJxDdGFusK51qlxN4=
gitlab.com/elixxir/crypto v0.0.0-20200721213839-b026955c55c0/go.mod h1:LHBAaEf48a0/AjU118rjoworH0LgXifhAqmNX3ZRvME=
gitlab.com/elixxir/crypto v0.0.0-20200803223738-661ca14b6470 h1:WGECBA9PtyUk9RfkpHjcbySoXfByEBTaD5IUHmjGem4=
gitlab.com/elixxir/crypto v0.0.0-20200803223738-661ca14b6470/go.mod h1:LHBAaEf48a0/AjU118rjoworH0LgXifhAqmNX3ZRvME=
+gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4/go.mod h1:ucm9SFKJo+K0N2GwRRpaNr+tKXMIOVWzmyUD0SbOu2c=
+gitlab.com/elixxir/crypto v0.0.0-20200805174804-bdf909f2a16d h1:3+o6r8a0o9/HIpBzlGCCiwuPN8OdEX3cHzdnCNqKDAw=
+gitlab.com/elixxir/crypto v0.0.0-20200805174804-bdf909f2a16d/go.mod h1:cu6uNoANVLV0J6HyTL6KqVtVyh9SHU1RjJhytYlsbVQ=
gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842 h1:m1zDQ6UadpuMnV7nvnyR+DUXE3AisRnVjajTb1xZE4c=
gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842/go.mod h1:bXY0kgbV5BHYda4YY5/hiG5bjimGK+R3PYub5yM9C/s=
gitlab.com/elixxir/ekv v0.1.0 h1:CXYdlWzR2MmT54WaVw3REdWayuSxYuGOQoAHL2YTWTA=
@@ -178,12 +183,25 @@ gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3 h1:GTfflZBNLeBq
gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3/go.mod h1:OQgUZq7SjnE0b+8+iIAT2eqQF+2IFHn73tOo+aV11mg=
gitlab.com/elixxir/primitives v0.0.0-20200731184040-494269b53b4d h1:OKWTmYN5q8XVHo8JXThIH0TCuvl/fLXR7MGVacpqfRg=
gitlab.com/elixxir/primitives v0.0.0-20200731184040-494269b53b4d/go.mod h1:OQgUZq7SjnE0b+8+iIAT2eqQF+2IFHn73tOo+aV11mg=
+gitlab.com/elixxir/primitives v0.0.0-20200804170709-a1896d262cd9/go.mod h1:p0VelQda72OzoUckr1O+vPW0AiFe0nyKQ6gYcmFSuF8=
+gitlab.com/elixxir/primitives v0.0.0-20200804182913-788f47bded40/go.mod h1:tzdFFvb1ESmuTCOl1z6+yf6oAICDxH2NPUemVgoNLxc=
+gitlab.com/elixxir/primitives v0.0.0-20200804231232-ad79a9e8f113/go.mod h1:tzdFFvb1ESmuTCOl1z6+yf6oAICDxH2NPUemVgoNLxc=
+gitlab.com/elixxir/primitives v0.0.0-20200805174810-86b366d1dd2d h1:ky5oz0D2EmOzk2n/A6Ugwj7S1B6rftxMJwc19sjGkz8=
+gitlab.com/elixxir/primitives v0.0.0-20200805174810-86b366d1dd2d/go.mod h1:tzdFFvb1ESmuTCOl1z6+yf6oAICDxH2NPUemVgoNLxc=
gitlab.com/xx_network/collections/ring.git v0.0.1 h1:3JLw2pgaOm57WWtjw6dvqvbud4DtoKxwYjEA95hNwgE=
gitlab.com/xx_network/collections/ring.git v0.0.1/go.mod h1:M61MlPiyB23ni0L1DJ8QErcUjOcnKEfbCpl75vE7Ej0=
gitlab.com/xx_network/comms v0.0.0-20200731231107-9e020daf0013 h1:sis9BdA5VNXUAamga/tpr4qHcJ01qugbMt6wBmaGyJ4=
gitlab.com/xx_network/comms v0.0.0-20200731231107-9e020daf0013/go.mod h1:ECW83bFGaOzZMM8axIWX6BsYpXakiM0Zf4Snp7H9+yI=
gitlab.com/xx_network/comms v0.0.0-20200803203304-a7a1c5e4239d h1:mU4Gk9IivWABbzAuibA4887yANHYOohlWq4Y4BvzR+8=
gitlab.com/xx_network/comms v0.0.0-20200803203304-a7a1c5e4239d/go.mod h1:Qg7dyO6DHgHzjUM1IQ5nbFoRyzx5wVZAjf4FOTeu8mA=
+gitlab.com/xx_network/comms v0.0.0-20200804225654-09a9af23d699/go.mod h1:owEcxTRl7gsoM8c3RQ5KAm5GstxrJp5tn+6JfQ4z5Hw=
+gitlab.com/xx_network/comms v0.0.0-20200805174823-841427dd5023 h1:fQPaxyuXyH3vl8qFlFDBEx8rlEzBnXBNy74K8ItFRM4=
+gitlab.com/xx_network/comms v0.0.0-20200805174823-841427dd5023/go.mod h1:owEcxTRl7gsoM8c3RQ5KAm5GstxrJp5tn+6JfQ4z5Hw=
+gitlab.com/xx_network/primitives v0.0.0-20200803231956-9b192c57ea7c/go.mod h1:wtdCMr7DPePz9qwctNoAUzZtbOSHSedcK++3Df3psjA=
+gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da h1:CCVslUwNC7Ul7NG5nu3ThGTSVUt1TxNRX+47f5TUwnk=
+gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da/go.mod h1:OK9xevzWCaPO7b1wiluVJGk7R5ZsuC7pHY5hteZFQug=
+gitlab.com/xx_network/ring v0.0.2 h1:TlPjlbFdhtJrwvRgIg4ScdngMTaynx/ByHBRZiXCoL0=
+gitlab.com/xx_network/ring v0.0.2/go.mod h1:aLzpP2TiZTQut/PVHR40EJAomzugDdHXetbieRClXIM=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=