From d0ec45a621d425749e33aeb42424d96ab7fbf8eb Mon Sep 17 00:00:00 2001
From: Bernardo Cardoso <bernardo@elixxir.io>
Date: Fri, 12 Apr 2019 15:14:34 -0600
Subject: [PATCH] Fix merge on cmd/root
---
cmd/root.go | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/cmd/root.go b/cmd/root.go
index 0b3178dc8..60d5ec5e8 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -274,7 +274,7 @@ var rootCmd = &cobra.Command{
// Set the cert paths explicitly to avoid data races
SetCertPaths(gwCertPath, registrationCertPath)
- sessionInitialization()
+ userID := sessionInitialization()
// Set up the listeners for both of the types the client needs for
// the integration test
// Normal text messages
@@ -296,8 +296,6 @@ var rootCmd = &cobra.Command{
(time.Duration(float64(1000000000) * (float64(1.0) / dummyFrequency)))
}
- userID := sessionInitialization()
-
// Only send a message if we have a message to send (except dummy messages)
recipientId := new(id.User).SetUints(&[4]uint64{0, 0, 0, destinationUserId})
if message != "" {
--
GitLab