Fix infinite loop when marshalling

Author: mpetrun5

chains/evm/message/across.go

@@ -2,6 +2,7 @@ package message
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"math/big"
 	"time"
@@ -176,7 +177,7 @@ func (h *AcrossMessageHandler) Listen(ctx context.Context) {
 		case wMsg := <-msgChn:
 			{
 				d := &AcrossData{}
-				err := d.UnmarshalJSON(wMsg.Payload)
+				err := json.Unmarshal(wMsg.Payload, d)
 				if err != nil {
 					log.Warn().Msgf("Failed unmarshaling across message: %s", err)
 					continue
@@ -204,7 +205,7 @@ func (h *AcrossMessageHandler) notify(data *AcrossData) error {
 	}
 
 	data.Coordinator = h.host.ID()
-	msgBytes, err := data.MarshalJSON()
+	msgBytes, err := json.Marshal(data)
 	if err != nil {
 		return err
 	}

chains/evm/message/across_test.go

@@ -115,7 +115,7 @@ func (s *AcrossMessageHandlerTestSuite) Test_HandleMessage_FailedLogQuery() {
 	s.mockEventFilterer.EXPECT().FilterLogs(gomock.Any(), gomock.Any()).Return([]types.Log{}, fmt.Errorf("error"))
 
 	errChn := make(chan error, 1)
-	ad := message.AcrossData{
+	ad := &message.AcrossData{
 		ErrChn:        errChn,
 		DepositId:     big.NewInt(100),
 		Nonce:         big.NewInt(101),
@@ -150,7 +150,7 @@ func (s *AcrossMessageHandlerTestSuite) Test_HandleMessage_LogMissing() {
 	s.mockEventFilterer.EXPECT().LatestBlock().Return(big.NewInt(100), nil)
 
 	errChn := make(chan error, 1)
-	ad := message.AcrossData{
+	ad := &message.AcrossData{
 		ErrChn:        errChn,
 		DepositId:     big.NewInt(100),
 		Nonce:         big.NewInt(101),
@@ -190,7 +190,7 @@ func (s *AcrossMessageHandlerTestSuite) Test_HandleMessage_IgnoreRemovedLogs() {
 	}, nil)
 
 	errChn := make(chan error, 1)
-	ad := message.AcrossData{
+	ad := &message.AcrossData{
 		ErrChn:        errChn,
 		DepositId:     big.NewInt(100),
 		Nonce:         big.NewInt(101),
@@ -239,7 +239,7 @@ func (s *AcrossMessageHandlerTestSuite) Test_HandleMessage_ValidLog() {
 	s.mockCoordinator.EXPECT().Execute(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil)
 
 	errChn := make(chan error, 1)
-	ad := message.AcrossData{
+	ad := &message.AcrossData{
 		ErrChn:        errChn,
 		DepositId:     big.NewInt(100),
 		Nonce:         big.NewInt(101),
@@ -290,7 +290,7 @@ func (s *AcrossMessageHandlerTestSuite) Test_HandleMessage_ZeroOutputToken() {
 	s.mockCoordinator.EXPECT().Execute(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil)
 
 	errChn := make(chan error, 1)
-	ad := message.AcrossData{
+	ad := &message.AcrossData{
 		ErrChn:        errChn,
 		DepositId:     big.NewInt(100),
 		Nonce:         big.NewInt(101),

chains/evm/message/mayan.go

@@ -3,6 +3,7 @@ package message
 import (
 	"context"
 	"encoding/hex"
+	"encoding/json"
 	"fmt"
 	"math/big"
 
@@ -201,7 +202,7 @@ func (h *MayanMessageHandler) Listen(ctx context.Context) {
 		case wMsg := <-msgChn:
 			{
 				d := &MayanData{}
-				err := d.UnmarshalJSON(wMsg.Payload)
+				err := json.Unmarshal(wMsg.Payload, d)
 				if err != nil {
 					log.Warn().Msgf("Failed unmarshaling Mayan message: %s", err)
 					continue
@@ -288,7 +289,7 @@ func (h *MayanMessageHandler) notify(data *MayanData) error {
 	}
 
 	data.Coordinator = h.host.ID()
-	msgBytes, err := data.MarshalJSON()
+	msgBytes, err := json.Marshal(data)
 	if err != nil {
 		return err
 	}

chains/evm/message/message.go

@@ -1,7 +1,6 @@
 package message
 
 import (
-	"encoding/json"
 	"fmt"
 	"math/big"
 	"time"
@@ -37,14 +36,6 @@ type AcrossData struct {
 	Destination   uint64
 }
 
-func (d *AcrossData) MarshalJSON() ([]byte, error) {
-	return json.Marshal(d)
-}
-
-func (d *AcrossData) UnmarshalJSON(data []byte) error {
-	return json.Unmarshal(data, &d)
-}
-
 func NewAcrossMessage(source, destination uint64, acrossData *AcrossData) *message.Message {
 	return &message.Message{
 		Source:      source,
@@ -69,14 +60,6 @@ type MayanData struct {
 	Destination   uint64
 }
 
-func (d *MayanData) MarshalJSON() ([]byte, error) {
-	return json.Marshal(d)
-}
-
-func (d *MayanData) UnmarshalJSON(data []byte) error {
-	return json.Unmarshal(data, &d)
-}
-
 func NewMayanMessage(source, destination uint64, mayanData *MayanData) *message.Message {
 	return &message.Message{
 		Source:      source,