Revert IPC protocol merge

Summary: Essentially a manual revert of D51524775 and D51584599, since these two diffs may be the cause of errors in CI. Reviewed By: perehonchuk Differential Revision: D52372925 fbshipit-source-id: 6530356dcd7de6949eec7dd87364860fa09c2782
WhatsApp · Dec 21, 2023 · 22c719e · 22c719e
1 parent 090fc58
commit 22c719e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/eqwalizer/src/main/scala/com/whatsapp/eqwalizer/Main.scala b/eqwalizer/src/main/scala/com/whatsapp/eqwalizer/Main.scala
@@ -58,10 +58,10 @@ object Main {
     }
     val modules = ipcArgs.tail
     val modulesAndStorages = modules.distinct.flatMap(m => DbApi.getAstStorage(m).map(m -> _))
-    if (config.useElp()) {
-      ELPDiagnostics.getDiagnosticsIpc(modulesAndStorages)
+    if (config.mode == Mode.Shell) {
+      ELPDiagnostics.getDiagnosticsIpcShell(modulesAndStorages)
     } else {
-      ELPDiagnostics.getDiagnosticsIpcMiniElp(modulesAndStorages)
+      ELPDiagnostics.getDiagnosticsIpc(modulesAndStorages)
     }
   }
 

diff --git a/eqwalizer/src/main/scala/com/whatsapp/eqwalizer/util/ELPDiagnostics.scala b/eqwalizer/src/main/scala/com/whatsapp/eqwalizer/util/ELPDiagnostics.scala
@@ -28,7 +28,7 @@ object ELPDiagnostics {
   def getDiagnosticsString(module: String, astStorage: DbApi.AstStorage, options: Options = noOptions): String =
     toJsonObj(Map(module -> getDiagnostics(module, astStorage, options))).render(indent = 2)
 
-  def getDiagnosticsIpcMiniElp(modulesAndStorages: Iterable[(String, DbApi.AstStorage)]): Unit =
+  def getDiagnosticsIpc(modulesAndStorages: Iterable[(String, DbApi.AstStorage)]): Unit =
     try {
       val diagnosticsByModule = mutable.Map.empty[String, List[Error]]
       for { (module, astStorage) <- modulesAndStorages } {
@@ -44,7 +44,7 @@ object ELPDiagnostics {
       case Ipc.Terminated => ()
     }
 
-  def getDiagnosticsIpc(modulesAndStorages: Iterable[(String, DbApi.AstStorage)]): Unit =
+  def getDiagnosticsIpcShell(modulesAndStorages: Iterable[(String, DbApi.AstStorage)]): Unit =
     try {
       for { (module, astStorage) <- modulesAndStorages } {
         if (Ipc.shouldEqwalize(module)) {