Fix cmix package

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

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
 }

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"
 )
 

cmix/pickup/params.go

-package rounds
+package pickup
 
 import "time"
 

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++ {

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"

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"

cmix/pickup/roundGetter.go

-package rounds
+package pickup
 
 import (
 	pb "gitlab.com/elixxir/comms/mixmessages"

cmix/pickup/unchecked.go

@@ -5,7 +5,7 @@
 // LICENSE file                                                              //
 ///////////////////////////////////////////////////////////////////////////////
 
-package rounds
+package pickup
 
 import (
 	jww "github.com/spf13/jwalterweatherman"

cmix/pickup/unchecked_test.go

@@ -5,7 +5,7 @@
 // LICENSE file                                                              //
 ///////////////////////////////////////////////////////////////////////////////
 
-package rounds
+package pickup
 
 import (
 	"gitlab.com/elixxir/client/cmix/gateway"

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"