Merge branch 'main' into PRT-solana-tokens-owner-verification

lavanet · Sep 26, 2024 · c63fe99 · c63fe99
2 parents c642cb2 + 85e4f5d
commit c63fe99
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/protocol/chainlib/consumer_websocket_manager.go b/protocol/chainlib/consumer_websocket_manager.go
@@ -223,7 +223,6 @@ func (cwm *ConsumerWebsocketManager) ListenToMessages() {
 						if err != nil {
 							continue
 						}
-
 						websocketConnWriteChan <- webSocketMsgWithType{messageType: messageType, msg: msgData}
 					}
 				}
@@ -241,17 +240,18 @@ func (cwm *ConsumerWebsocketManager) ListenToMessages() {
 					formatterMsg := logger.AnalyzeWebSocketErrorAndGetFormattedMessage(websocketConn.LocalAddr().String(), utils.LavaFormatError("could not send parsed relay", err), msgSeed, msg, cwm.apiInterface, time.Since(startTime))
 					if formatterMsg != nil {
 						websocketConnWriteChan <- webSocketMsgWithType{messageType: messageType, msg: formatterMsg}
-						continue
 					}
+					continue
 				}
 
 				relayResultReply := relayResult.GetReply()
 				if relayResultReply != nil {
 					// No need to verify signature since this is already happening inside the SendParsedRelay flow
 					websocketConnWriteChan <- webSocketMsgWithType{messageType: messageType, msg: relayResult.GetReply().Data}
-					continue
+				} else {
+					utils.LavaFormatError("Relay result is nil over websocket normal request flow, should not happen", err, utils.LogAttr("messageType", messageType))
 				}
-				utils.LavaFormatError("Relay result is nil over websocket normal request flow, should not happen", err, utils.LogAttr("messageType", messageType))
+				continue
 			}
 		}
 

diff --git a/protocol/metrics/rpcconsumerlogs.go b/protocol/metrics/rpcconsumerlogs.go
@@ -139,13 +139,14 @@ func (rpccl *RPCConsumerLogs) AnalyzeWebSocketErrorAndGetFormattedMessage(webSoc
 		}
 		rpccl.LogRequestAndResponse(rpcType+" ws msg", true, "ws", webSocketAddr, string(msg), "", msgSeed, timeTaken, err)
 
-		jsonResponse, _ := json.Marshal(fiber.Map{
+		jsonResponse, err := json.Marshal(fiber.Map{
 			"Error_Received": rpccl.GetUniqueGuidResponseForError(err, msgSeed),
 		})
-
+		if err != nil {
+			utils.LavaFormatError("AnalyzeWebSocketErrorAndGetFormattedMessage unexpected behavior, failed marshalling json response", err, utils.LogAttr("seed", msgSeed))
+		}
 		return jsonResponse
 	}
-
 	return nil
 }