From ef8d9e5e5a9c971de8ac87fadeee06bc854be6fe Mon Sep 17 00:00:00 2001
From: joshemb <josh@elixxir.io>
Date: Thu, 18 Aug 2022 15:55:41 -0700
Subject: [PATCH] Clean up branch
---
bindings/deleteThis_test.go | 1 -
bindings/e2e.go | 7 -------
bindings/identity.go | 4 ----
registration/register.go | 9 ---------
ud/register.go | 9 ---------
5 files changed, 30 deletions(-)
delete mode 100644 bindings/deleteThis_test.go
diff --git a/bindings/deleteThis_test.go b/bindings/deleteThis_test.go
deleted file mode 100644
index 95f91744f..000000000
--- a/bindings/deleteThis_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package bindings
diff --git a/bindings/e2e.go b/bindings/e2e.go
index 3c5109968..7e0311286 100644
--- a/bindings/e2e.go
+++ b/bindings/e2e.go
@@ -160,13 +160,6 @@ func (e *E2e) GetUdContactFromNdf() ([]byte, error) {
udDhPubKeyData := netDef.UDB.DhPubKey
udDhPubKey := e2eGroup.NewInt(1)
err = udDhPubKey.UnmarshalJSON(udDhPubKeyData)
-
- jww.WARN.Printf("GetUdContactFromNdf debug\n"+
- "netDef UD: %v\n"+
- "netDef DHPubKey: %v\n"+
- "udDhPubKey.UnmarshalJSON (key:%v, err: %v)\n",
- netDef.UDB, netDef.UDB.DhPubKey, udDhPubKey, err)
-
if err != nil {
jww.WARN.Printf("GetUdContactFromNdf debug fails on udDhPubKey.UnmarshalJSON")
return nil, err
diff --git a/bindings/identity.go b/bindings/identity.go
index 1385e5848..9f2f76da9 100644
--- a/bindings/identity.go
+++ b/bindings/identity.go
@@ -8,9 +8,7 @@
package bindings
import (
- "encoding/base64"
"encoding/json"
- jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/xxdk"
"gitlab.com/elixxir/crypto/contact"
"gitlab.com/elixxir/primitives/fact"
@@ -95,8 +93,6 @@ func (c *Cmix) MakeLegacyReceptionIdentity() ([]byte, error) {
// the xx network.
func (c *Cmix) GetReceptionRegistrationValidationSignature() []byte {
regSig := c.api.GetStorage().GetReceptionRegistrationValidationSignature()
- jww.WARN.Printf("UD DEBUG: Reception reg valid sig: %v",
- base64.StdEncoding.EncodeToString(regSig))
return regSig
}
diff --git a/registration/register.go b/registration/register.go
index f83858773..97c1f3d6d 100644
--- a/registration/register.go
+++ b/registration/register.go
@@ -8,10 +8,8 @@
package registration
import (
- "encoding/base64"
"github.com/golang/protobuf/proto"
"github.com/pkg/errors"
- jww "github.com/spf13/jwalterweatherman"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/crypto/registration"
"gitlab.com/xx_network/comms/connect"
@@ -83,13 +81,6 @@ func register(comms registrationMessageSender, host *connect.Host,
"transmission confirmation message")
}
- jww.WARN.Printf("UD DEBUG: IN NETWORK REGISTER:"+
- "\ntimestamp: %d"+
- "\nrsa pub key PEM: %s"+
- "\nperm sig: %s",
- receptionConfirmation.Timestamp, receptionPem, base64.StdEncoding.EncodeToString(receptionSignature),
- )
-
// Verify transmission signature
transmissionSignature := response.GetClientTransmissionConfirmation().
GetRegistrarSignature().Signature
diff --git a/ud/register.go b/ud/register.go
index bda8100fc..495d50da5 100644
--- a/ud/register.go
+++ b/ud/register.go
@@ -3,7 +3,6 @@ package ud
import (
"fmt"
"github.com/pkg/errors"
- jww "github.com/spf13/jwalterweatherman"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/factID"
@@ -47,14 +46,6 @@ func (m *Manager) register(username string, networkSignature []byte,
Timestamp: m.user.GetTransmissionIdentity().RegistrationTimestamp,
}
- jww.WARN.Printf("UD DEBUG:"+
- "\npermSig: %s"+
- "\nrsaPubKey: %s"+
- "\ntimestamp: %v",
- networkSignature,
- string(rsa.CreatePublicKeyPem(privKey.GetPublic())),
- m.user.GetTransmissionIdentity().RegistrationTimestamp)
-
// Sign the identity data and add to user registration message
identityDigest := msg.IdentityRegistration.Digest()
msg.IdentitySignature, err = rsa.Sign(rng, privKey,
--
GitLab