fix conflict

b2network · Nov 24, 2023 · a6e848d · a6e848d
1 parent 94d9d9f
commit a6e848d
Showing 1 changed file with 0 additions and 20 deletions.
diff --git a/server/start.go b/server/start.go
@@ -725,26 +725,6 @@ func startInProcess(ctx *server.Context, clientCtx client.Context, opts StartOpt
 		}
 	}
 
-	if bitcoinCfg.Evm.EnableListener {
-		logger.Info("EVMListenerService start...")
-		listenerService := bitcoin.NewEVMListenerService(clientCtx.Client, bitcoinCfg)
-		listenerLogger := ctx.Logger.With("EVMListener", "evm")
-		listenerService.SetLogger(listenerLogger)
-
-		errCh := make(chan error)
-		go func() {
-			if err := listenerService.Start(); err != nil {
-				errCh <- err
-			}
-		}()
-
-		select {
-		case err := <-errCh:
-			return err
-		case <-time.After(types.ServerStartTime): // assume server started successfully
-		}
-	}
-
 	// Wait for SIGINT or SIGTERM signal
 	return server.WaitForQuitSignals()
 }