Config not embedded anymore on outbox struct

Author: aperonam

pss/outbox/outbox.go

@@ -25,7 +25,8 @@ type Config struct {
 }
 
 type outbox struct {
-	Config
+	forward forwardFunc
+	quitC   chan struct{}
 	queue   []*outboxMsg
 	slots   chan int
 	process chan int
@@ -34,7 +35,8 @@ type forwardFunc func(msg interface{}) error
 
 func NewOutbox(config *Config) *outbox {
 	outbox := outbox{
-		Config:  *config,
+		forward: config.Forward,
+		quitC:   config.QuitC,
 		process: make(chan int),
 		slots:   make(chan int, config.NumberSlots),
 		queue:   make([]*outboxMsg, config.NumberSlots),
@@ -57,7 +59,7 @@ func (o *outbox) Enqueue(outboxmsg *outboxMsg) error {
 		// we send this message slot to process
 		select {
 		case o.process <- slot:
-		case <-o.QuitC:
+		case <-o.quitC:
 		}
 		return nil
 	default:
@@ -71,7 +73,7 @@ func (o *outbox) ProcessOutbox() {
 		go func(slot int) {
 			msg := o.msg(slot)
 			metrics.GetOrRegisterResettingTimer("pss.handle.outbox", nil).UpdateSince(msg.startedAt)
-			if err := o.Forward(msg.msg); err != nil {
+			if err := o.forward(msg.msg); err != nil {
 				metrics.GetOrRegisterCounter("pss.forward.err", nil).Inc(1)
 				// if we failed to forward, re-insert message in the queue
 				log.Debug(err.Error())
@@ -88,7 +90,7 @@ func (o *outbox) ProcessOutbox() {
 }
 
 func (o *outbox) SetForwardFunction(f forwardFunc) {
-	o.Forward = f
+	o.forward = f
 }
 
 func (o *outbox) msg(slot int) *outboxMsg {
@@ -102,7 +104,7 @@ func (o *outbox) free(slot int) {
 func (o *outbox) reenqueue(slot int) {
 	select {
 	case o.process <- slot:
-	case <-o.QuitC:
+	case <-o.quitC:
 	}
 }
 

pss/outbox/outbox_test.go

@@ -55,7 +55,7 @@ func TestMessageOutbox(t *testing.T) {
 		return errors.New("forced test error forwarding message")
 	}
 
-	outbox.Forward = failedForward
+	outbox.forward = failedForward
 
 	err = outbox.Enqueue(outboxMessage)
 	if err != nil {
@@ -72,7 +72,7 @@ func TestMessageOutbox(t *testing.T) {
 		t.Fatal("Incorrect number of failed messages, expected 1 got 0")
 	}
 	// The message will be retried once we send to continueC, so first, we change the forward function
-	outbox.Forward = forward
+	outbox.forward = forward
 	continueC <- struct{}{}
 	select {
 	case <-successC:

pss/pss.go

@@ -707,7 +707,7 @@ func (p *Pss) forward(msg interface{}) error {
 	var pssMsg *PssMsg
 	pssMsg, ok := msg.(*PssMsg)
 	if !ok {
-		return errors.New("cannot forward a non pssMsg pssMsg")
+		return errors.New("cannot forward a non pssMsg")
 	}
 
 	metrics.GetOrRegisterCounter("pss.forward", nil).Inc(1)