Fix master merge conflicts

CoreumFoundation · Dec 11, 2023 · 5710fa2 · 5710fa2
1 parent bbe1f3c
commit 5710fa2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/contract/src/operation.rs b/contract/src/operation.rs
@@ -143,7 +143,7 @@ pub fn handle_coreum_to_xrpl_transfer_confirmation(
                         match COREUM_TOKENS
                             .idx
                             .xrpl_currency
-                            .item(storage, currency.to_owned())?
+                            .item(storage, currency)?
                             .map(|(_, ct)| ct)
                         {
                             Some(token) => {

diff --git a/integration-tests/processes/send_test.go b/integration-tests/processes/send_test.go
@@ -138,7 +138,7 @@ func TestSendXRPTokenFromXRPLToCoreumAndBack(t *testing.T) {
 
 	envCfg := DefaultRunnerEnvConfig()
 	runnerEnv := NewRunnerEnv(ctx, t, envCfg, chains)
-	runnerEnv.StartAllRunnerProcesses(ctx, t)
+	runnerEnv.StartAllRunnerProcesses()
 	runnerEnv.AllocateTickets(ctx, t, uint32(200))
 
 	coreumSender := chains.Coreum.GenAccount()

diff --git a/integration-tests/xrpl/scanner_test.go b/integration-tests/xrpl/scanner_test.go
@@ -114,11 +114,12 @@ func TestRecentHistoryScanAccountTx(t *testing.T) {
 		spawn("scan", parallel.Continue, func(ctx context.Context) error {
 			return scanner.ScanTxs(ctx, txsCh)
 		})
-		spawn("write", parallel.Continue, func(ctx context.Context) error {
+		// write and exist
+		spawn("write", parallel.Exit, func(ctx context.Context) error {
 			writtenTxHashes = sendMultipleTxs(ctx, t, chains.XRPL, txsCount, senderAcc, recipientAcc)
 			return nil
 		})
-		spawn("wait", parallel.Exit, func(ctx context.Context) error {
+		spawn("wait", parallel.Continue, func(ctx context.Context) error {
 			t.Logf("Waiting for %d transactions to be scanned by the scanner", txsCount)
 			for tx := range txsCh {
 				receivedTxHashes[tx.GetHash().String()] = struct{}{}

diff --git a/relayer/logger/zap.go b/relayer/logger/zap.go
@@ -26,7 +26,8 @@ var _ ParallelLogger = &ParallelZapLogger{}
 
 // ParallelZapLogger is parallel zap logger.
 type ParallelZapLogger struct {
-	ctx    context.Context //nolint:containedctx // the design depends on the parallel logger design where the ctx is set similar
+	//nolint:containedctx // the design depends on the parallel logger design where the ctx is set similar
+	ctx    context.Context
 	zapLog *ZapLogger
 }
 

diff --git a/relayer/processes/xrpl_tx_observer_test.go b/relayer/processes/xrpl_tx_observer_test.go
@@ -556,7 +556,7 @@ func TestXRPLTxObserver_Start(t *testing.T) {
 				tt.txScannerBuilder(ctrl, cancel),
 				contractClient,
 			)
-			require.NoError(t, o.Start(ctx))
+			require.ErrorIs(t, o.Start(ctx), context.Canceled)
 		})
 	}
 }