Remove PushData() and add PopOpts() methods

message.go

@@ -36,6 +36,17 @@ func (m *message) PopData() (ret []byte, err error) {
 	return
 }
 
+// PopData get the data stored by the previous handler
+func (m *message) PopOpts() (ret map[string]interface{}, err error) {
+	if m.opts.Empty() {
+		err = errors.New("Empty stack")
+		return
+	}
+	ret = m.opts.Pop().(map[string]interface{})
+
+	return
+}
+
 func (m message) GetReports() []Report {
 	var reports []Report
 

rbforwarder_test.go

@@ -25,7 +25,8 @@ func (c *MockMiddleComponent) OnMessage(
 	c.Called(m)
 	data, _ := m.PopData()
 	processedData := "-> [" + string(data) + "] <-"
-	m.PushData([]byte(processedData))
+	message := m.(*message)
+	message.PushData([]byte(processedData))
 	next(m)
 
 }

types/messenger.go

@@ -3,5 +3,5 @@ package types
 // Messenger is used by modules to handle messages
 type Messenger interface {
 	PopData() ([]byte, error)
-	PushData(data []byte)
+	PopOpts() (map[string]interface{}, error)
 }