From e0a882b6f24dd02cd7b986f7a2a1f03900952e4d Mon Sep 17 00:00:00 2001
From: jbhusson <jonah@elixxir.io>
Date: Fri, 8 Apr 2022 09:50:46 -0400
Subject: [PATCH] Fix cmix package
---
cmix/client.go | 8 ++++----
cmix/params.go | 6 ++++--
cmix/pickup/get.go | 4 ++--
cmix/pickup/params.go | 2 +-
cmix/pickup/pickup.go | 6 +++---
cmix/pickup/retrieve.go | 4 ++--
cmix/pickup/retrieve_test.go | 4 ++--
cmix/pickup/roundGetter.go | 2 +-
cmix/pickup/unchecked.go | 2 +-
cmix/pickup/unchecked_test.go | 2 +-
cmix/pickup/utils_test.go | 2 +-
11 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/cmix/client.go b/cmix/client.go
index 2beb6873d..0db561b23 100644
--- a/cmix/client.go
+++ b/cmix/client.go
@@ -15,11 +15,11 @@ import (
"gitlab.com/elixxir/client/cmix/address"
"gitlab.com/elixxir/client/cmix/gateway"
"gitlab.com/elixxir/client/cmix/health"
- "gitlab.com/elixxir/client/cmix/rounds"
"gitlab.com/elixxir/client/cmix/identity"
"gitlab.com/elixxir/client/cmix/message"
"gitlab.com/elixxir/client/cmix/nodes"
"gitlab.com/elixxir/client/cmix/pickup"
+ "gitlab.com/elixxir/client/cmix/rounds"
"gitlab.com/elixxir/client/event"
"gitlab.com/elixxir/client/stoppable"
"gitlab.com/elixxir/client/storage"
@@ -65,7 +65,7 @@ type client struct {
message.Handler
nodes.Registrar
rounds.Retriever
- rounds.Pickup
+ pickup.Pickup
address.Space
identity.Tracker
health.Monitor
@@ -158,8 +158,8 @@ func NewManager(params Params, comms *commClient.Comms, session storage.Session,
c.session.GetReceptionID())
// Set up round handler
- c.Pickup = rounds.NewPickup(
- params.Rounds, c.Handler.GetMessageReceptionChannel(), c.Sender,
+ c.Pickup = pickup.NewPickup(
+ params.Pickup, c.Handler.GetMessageReceptionChannel(), c.Sender,
c.Retriever, c.rng, c.instance, c.session)
// Add the identity system
diff --git a/cmix/params.go b/cmix/params.go
index e334217c5..23ce735e8 100644
--- a/cmix/params.go
+++ b/cmix/params.go
@@ -3,9 +3,9 @@ package cmix
import (
"encoding/base64"
"encoding/json"
- "gitlab.com/elixxir/client/cmix/rounds"
"gitlab.com/elixxir/client/cmix/message"
"gitlab.com/elixxir/client/cmix/pickup"
+ "gitlab.com/elixxir/client/cmix/rounds"
"gitlab.com/elixxir/client/stoppable"
"gitlab.com/elixxir/primitives/excludedRounds"
"gitlab.com/xx_network/primitives/id"
@@ -51,6 +51,7 @@ type Params struct {
ReplayRequests bool
Rounds rounds.Params
+ Pickup pickup.Params
Message message.Params
Historical rounds.Params
}
@@ -69,6 +70,7 @@ func GetDefaultParams() Params {
ReplayRequests: true,
}
n.Rounds = rounds.GetDefaultParams()
+ n.Pickup = pickup.GetDefaultParams()
n.Message = message.GetDefaultParams()
n.Historical = rounds.GetDefaultParams()
@@ -81,7 +83,7 @@ func (n Params) Marshal() ([]byte, error) {
func (n Params) SetRealtimeOnlyAll() Params {
n.RealtimeOnly = true
- n.Rounds.RealtimeOnly = true
+ n.Pickup.RealtimeOnly = true
n.Message.RealtimeOnly = true
return n
}
diff --git a/cmix/pickup/get.go b/cmix/pickup/get.go
index 9ecee34cb..f7a503b1d 100644
--- a/cmix/pickup/get.go
+++ b/cmix/pickup/get.go
@@ -5,12 +5,12 @@
// LICENSE file //
///////////////////////////////////////////////////////////////////////////////
-package rounds
+package pickup
import (
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/cmix/rounds"
"gitlab.com/elixxir/client/cmix/identity/receptionID"
+ "gitlab.com/elixxir/client/cmix/rounds"
"gitlab.com/xx_network/primitives/id"
)
diff --git a/cmix/pickup/params.go b/cmix/pickup/params.go
index ab7f956c9..95200674d 100644
--- a/cmix/pickup/params.go
+++ b/cmix/pickup/params.go
@@ -1,4 +1,4 @@
-package rounds
+package pickup
import "time"
diff --git a/cmix/pickup/pickup.go b/cmix/pickup/pickup.go
index f7653e44d..73706f1fb 100644
--- a/cmix/pickup/pickup.go
+++ b/cmix/pickup/pickup.go
@@ -5,14 +5,14 @@
// LICENSE file //
///////////////////////////////////////////////////////////////////////////////
-package rounds
+package pickup
import (
"gitlab.com/elixxir/client/cmix/gateway"
- "gitlab.com/elixxir/client/cmix/rounds"
"gitlab.com/elixxir/client/cmix/identity/receptionID"
"gitlab.com/elixxir/client/cmix/message"
"gitlab.com/elixxir/client/cmix/pickup/store"
+ "gitlab.com/elixxir/client/cmix/rounds"
"gitlab.com/elixxir/client/stoppable"
"gitlab.com/elixxir/client/storage"
"gitlab.com/elixxir/crypto/fastRNG"
@@ -66,7 +66,7 @@ func NewPickup(params Params, bundles chan<- message.Bundle,
func (m *pickup) StartProcessors() stoppable.Stoppable {
- multi := stoppable.NewMulti("Rounds")
+ multi := stoppable.NewMulti("Pickup")
// Start the message retrieval worker pool
for i := uint(0); i < m.params.NumMessageRetrievalWorkers; i++ {
diff --git a/cmix/pickup/retrieve.go b/cmix/pickup/retrieve.go
index d6d5889c6..c66b52092 100644
--- a/cmix/pickup/retrieve.go
+++ b/cmix/pickup/retrieve.go
@@ -5,16 +5,16 @@
// LICENSE file //
///////////////////////////////////////////////////////////////////////////////
-package rounds
+package pickup
import (
"encoding/binary"
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/cmix/gateway"
- "gitlab.com/elixxir/client/cmix/rounds"
"gitlab.com/elixxir/client/cmix/identity/receptionID"
"gitlab.com/elixxir/client/cmix/message"
+ "gitlab.com/elixxir/client/cmix/rounds"
"gitlab.com/elixxir/client/stoppable"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/crypto/shuffle"
diff --git a/cmix/pickup/retrieve_test.go b/cmix/pickup/retrieve_test.go
index baacbe18a..cf580ec42 100644
--- a/cmix/pickup/retrieve_test.go
+++ b/cmix/pickup/retrieve_test.go
@@ -4,14 +4,14 @@
// Use of this source code is governed by a license that can be found in the //
// LICENSE file //
///////////////////////////////////////////////////////////////////////////////
-package rounds
+package pickup
import (
"bytes"
"gitlab.com/elixxir/client/cmix/gateway"
- "gitlab.com/elixxir/client/cmix/rounds"
ephemeral2 "gitlab.com/elixxir/client/cmix/identity/receptionID"
"gitlab.com/elixxir/client/cmix/message"
+ "gitlab.com/elixxir/client/cmix/rounds"
"gitlab.com/elixxir/client/stoppable"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/xx_network/comms/connect"
diff --git a/cmix/pickup/roundGetter.go b/cmix/pickup/roundGetter.go
index a319562a3..9f01fa497 100644
--- a/cmix/pickup/roundGetter.go
+++ b/cmix/pickup/roundGetter.go
@@ -1,4 +1,4 @@
-package rounds
+package pickup
import (
pb "gitlab.com/elixxir/comms/mixmessages"
diff --git a/cmix/pickup/unchecked.go b/cmix/pickup/unchecked.go
index a09909074..22afaa565 100644
--- a/cmix/pickup/unchecked.go
+++ b/cmix/pickup/unchecked.go
@@ -5,7 +5,7 @@
// LICENSE file //
///////////////////////////////////////////////////////////////////////////////
-package rounds
+package pickup
import (
jww "github.com/spf13/jwalterweatherman"
diff --git a/cmix/pickup/unchecked_test.go b/cmix/pickup/unchecked_test.go
index 213952c8d..339826469 100644
--- a/cmix/pickup/unchecked_test.go
+++ b/cmix/pickup/unchecked_test.go
@@ -5,7 +5,7 @@
// LICENSE file //
///////////////////////////////////////////////////////////////////////////////
-package rounds
+package pickup
import (
"gitlab.com/elixxir/client/cmix/gateway"
diff --git a/cmix/pickup/utils_test.go b/cmix/pickup/utils_test.go
index c2c11db71..d25491d28 100644
--- a/cmix/pickup/utils_test.go
+++ b/cmix/pickup/utils_test.go
@@ -4,7 +4,7 @@
// Use of this source code is governed by a license that can be found in the //
// LICENSE file //
///////////////////////////////////////////////////////////////////////////////
-package rounds
+package pickup
import (
"github.com/pkg/errors"
--
GitLab