PRT-999 fixing lint issues due to malformed merge conflict resolution (…

…#923) * fixing lint issues due to malformed merge conflict resolution * give more time for the consistency race to succeed in test --------- Co-authored-by: omerlavanet <[email protected]>
lavanet · Oct 26, 2023 · de2dd59 · de2dd59
1 parent b459bd3
commit de2dd59
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/protocol/chainlib/chain_message.go b/protocol/chainlib/chain_message.go
@@ -28,9 +28,6 @@ func (pm *parsedMessage) DisableErrorHandling() {
 	pm.msg.DisableErrorHandling()
 }
 
-func (pm *parsedMessage) DisableErrorHandling() {
-}
-
 func (pm parsedMessage) AppendHeader(metadata []pairingtypes.Metadata) {
 	pm.msg.AppendHeader(metadata)
 }

diff --git a/protocol/rpcprovider/cors_test.go b/protocol/rpcprovider/cors_test.go
@@ -92,7 +92,7 @@ func TestPerformCORSCheckFail(t *testing.T) {
 
 	err := performCORSCheck(endpoint)
 	require.NotNil(t, err, "Expected CORS check to fail but it passed")
-	require.True(t, strings.Contains(err.Error(), "CORS check failed"), "Expected CORS related error message")
+	require.True(t, strings.Contains(err.Error(), "CORS check failed"), "Expected CORS related error message", err)
 }
 
 func TestPerformCORSCheckFailXGrpcWeb(t *testing.T) {

diff --git a/protocol/rpcprovider/rpcprovider_server_test.go b/protocol/rpcprovider/rpcprovider_server_test.go
@@ -243,7 +243,7 @@ func TestHandleConsistency(t *testing.T) {
 				// advance mockChainTracker
 				if len(play.chainTrackerBlocks) > 1 {
 					nextBlock := play.chainTrackerBlocks[1]
-					time.Sleep(3 * time.Millisecond)
+					time.Sleep(4 * time.Millisecond)
 					mockChainTracker.SetLatestBlock(nextBlock, time.Now())
 				}
 			}()