From a7950af335ccb3525122a0717f2f9b854aa51321 Mon Sep 17 00:00:00 2001
From: Roman Volosovskyi <roman.wolosovskyi@gmail.com>
Date: Wed, 4 Oct 2017 21:56:27 +0200
Subject: [PATCH] remove code related to restarting RPC server on entering
 background (#2008)

* remove restart-rpc-server, stop-rpc-server, start-rpc-server functions and related code

* clean native code
---
 .../status/ethereum/module/StatusModule.java  | 36 -------------------
 .../ios/RCTStatus/RCTStatus.m                 | 20 -----------
 src/status_im/native_module/core.cljs         | 12 -------
 src/status_im/native_module/impl/module.cljs  | 29 ---------------
 .../impl/non_status_go_module.cljs            |  3 --
 src/status_im/native_module/module.cljs       |  3 --
 src/status_im/protocol/handlers.cljs          |  1 -
 src/status_im/ui/screens/events.cljs          | 17 ++-------
 8 files changed, 3 insertions(+), 118 deletions(-)

diff --git a/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
index 9226f72bf8..5208eab95f 100644
--- a/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
+++ b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
@@ -320,42 +320,6 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         thread.start();
     }
 
-    @ReactMethod
-    public void startNodeRPCServer() {
-        Log.d(TAG, "startNodeRPCServer");
-        final Activity activity = getCurrentActivity();
-        if (activity == null) {
-            return;
-        }
-
-        Thread thread = new Thread() {
-            @Override
-            public void run() {
-                Statusgo.StartNodeRPCServer();
-            }
-        };
-
-        thread.start();
-    }
-
-    @ReactMethod
-    public void stopNodeRPCServer() {
-        Log.d(TAG, "stopNodeRPCServer");
-        final Activity activity = getCurrentActivity();
-        if (activity == null) {
-            return;
-        }
-
-        Thread thread = new Thread() {
-            @Override
-            public void run() {
-                Statusgo.StopNodeRPCServer();
-            }
-        };
-
-        thread.start();
-    }
-
     @ReactMethod
     public void stopNode() {
 
diff --git a/modules/react-native-status/ios/RCTStatus/RCTStatus.m b/modules/react-native-status/ios/RCTStatus/RCTStatus.m
index 7bbe913741..025e8c5b08 100644
--- a/modules/react-native-status/ios/RCTStatus/RCTStatus.m
+++ b/modules/react-native-status/ios/RCTStatus/RCTStatus.m
@@ -214,26 +214,6 @@ RCT_EXPORT_METHOD(moveToInternalStorage:(RCTResponseSenderBlock)onResultCallback
     onResultCallback(@[[NSNull null]]);
 }
 
-////////////////////////////////////////////////////////////////////
-#pragma mark - StartNodeRPCServer method
-//////////////////////////////////////////////////////////////////// createAccount
-RCT_EXPORT_METHOD(startNodeRPCServer) {
-#if DEBUG
-    NSLog(@"StartNodeRPCServer() method called");
-#endif
-    StartNodeRPCServer();
-}
-
-////////////////////////////////////////////////////////////////////
-#pragma mark - StopNodeRPCServer method
-//////////////////////////////////////////////////////////////////// createAccount
-RCT_EXPORT_METHOD(stopNodeRPCServer) {
-#if DEBUG
-    NSLog(@"StopNodeRPCServer() method called");
-#endif
-    StopNodeRPCServer();
-}
-
 ////////////////////////////////////////////////////////////////////
 #pragma mark - StopNode method
 //////////////////////////////////////////////////////////////////// StopNode
diff --git a/src/status_im/native_module/core.cljs b/src/status_im/native_module/core.cljs
index 997f4cb279..48f0891cff 100644
--- a/src/status_im/native_module/core.cljs
+++ b/src/status_im/native_module/core.cljs
@@ -36,18 +36,6 @@
   (module-interface/-stop-node rns-module))
 
 
-(defn stop-rpc-server []
-  (module-interface/-stop-rpc-server rns-module))
-
-
-(defn start-rpc-server []
-  (module-interface/-start-rpc-server rns-module))
-
-
-(defn restart-rpc []
-  (module-interface/-restart-rpc rns-module))
-
-
 (defn create-account [password callback]
   (module-interface/-create-account rns-module password callback))
 
diff --git a/src/status_im/native_module/impl/module.cljs b/src/status_im/native_module/impl/module.cljs
index d71b223db3..35248232ad 100644
--- a/src/status_im/native_module/impl/module.cljs
+++ b/src/status_im/native_module/impl/module.cljs
@@ -81,29 +81,6 @@
   (when status
     (call-module #(.startNode status config))))
 
-(defn stop-rpc-server []
-  (when status
-    (call-module #(.stopNodeRPCServer status))))
-
-(defn start-rpc-server []
-  (when status
-    (call-module #(.startNodeRPCServer status))))
-
-(defonce restarting-rpc (atom false))
-
-(defn restart-rpc []
-  (when-not @restarting-rpc
-    (reset! restarting-rpc true)
-    (log/debug :restart-rpc-on-post-error)
-
-    ;; todo maybe it would be better to use something like
-    ;; restart-rpc-server on status-go side
-    (stop-rpc-server)
-    (start-rpc-server)
-
-    (go (<! (timeout 3000))
-        (reset! restarting-rpc false))))
-
 (defonce account-creation? (atom false))
 
 (defn create-account [password on-result]
@@ -244,12 +221,6 @@
     (start-node config))
   (-stop-node [this]
     (stop-node))
-  (-stop-rpc-server [this]
-    (stop-rpc-server))
-  (-start-rpc-server [this]
-    (start-rpc-server))
-  (-restart-rpc [this]
-    (restart-rpc))
   (-create-account [this password callback]
     (create-account password callback))
   (-recover-account [this passphrase password callback]
diff --git a/src/status_im/native_module/impl/non_status_go_module.cljs b/src/status_im/native_module/impl/non_status_go_module.cljs
index 84d759f787..de5d3a22b8 100644
--- a/src/status_im/native_module/impl/non_status_go_module.cljs
+++ b/src/status_im/native_module/impl/non_status_go_module.cljs
@@ -16,9 +16,6 @@
     (re-frame/dispatch [:signal-event "{\"type\":\"node.started\",\"event\":{}}"])
     (re-frame/dispatch [:signal-event "{\"type\":\"node.ready\",\"event\":{}}"]))
   (-stop-node [this])
-  (-stop-rpc-server [this])
-  (-start-rpc-server [this])
-  (-restart-rpc [this])
   (-create-account [this password callback]
     (let [address (str "c9f5c0e2bea0aabb6b0b618e9f45ab0958" (gstring/format "%06d" (rand-int 100000)))]
       (callback (str "{\"address\":\"" address "\",\"pubkey\":\"0x046a313ba760e8853356b42a8732db1e2c339602977a3ac3d57ec2056449439b2c9f28e2e0dd243ac319f5da198b4a96f980d0ab6d4c7220ca7c5e1af2bd1ee8c7\",\"mnemonic\":\"robust rib ramp adult cannon amateur refuse burden review feel scout sell\",\"error\":\"\"}"))))
diff --git a/src/status_im/native_module/module.cljs b/src/status_im/native_module/module.cljs
index d2691bf307..0337c09b39 100644
--- a/src/status_im/native_module/module.cljs
+++ b/src/status_im/native_module/module.cljs
@@ -5,9 +5,6 @@
   (-move-to-internal-storage [this callback])
   (-start-node [this config])
   (-stop-node [this])
-  (-stop-rpc-server [this])
-  (-start-rpc-server [this])
-  (-restart-rpc [this])
   (-create-account [this password callback])
   (-recover-account [this passphrase password callback])
   (-login [this address password callback])
diff --git a/src/status_im/protocol/handlers.cljs b/src/status_im/protocol/handlers.cljs
index d7cdda8473..c4a56f26da 100644
--- a/src/status_im/protocol/handlers.cljs
+++ b/src/status_im/protocol/handlers.cljs
@@ -397,7 +397,6 @@
             android-error? (re-find (re-pattern "Failed to connect") message)]
         (when (or ios-error? android-error?)
           (when android-error? (status/init-jail))
-          (status/restart-rpc)
           (dispatch [:load-commands!]))))))
 
 (register-handler
diff --git a/src/status_im/ui/screens/events.cljs b/src/status_im/ui/screens/events.cljs
index b0c0651bf0..621897008d 100644
--- a/src/status_im/ui/screens/events.cljs
+++ b/src/status_im/ui/screens/events.cljs
@@ -158,16 +158,6 @@
   (fn []
     (status/module-initialized!)))
 
-(reg-fx
-  ::stop-rpc-server
-  (fn []
-    (status/stop-rpc-server)))
-
-(reg-fx
-  ::start-rpc-server
-  (fn []
-    (status/start-rpc-server)))
-
 (reg-fx
   ::request-permissions-fx
   (fn [[permissions then else]]
@@ -348,10 +338,9 @@
 (register-handler-fx
   :app-state-change
   (fn [_ [_ state]]
-    (case state
-      "background" {::stop-rpc-server nil}
-      "active" {::start-rpc-server nil}
-      nil)))
+    ;; TODO(rasom): let's not remove this handler, it will be used for
+    ;; pausing node on entering background on android
+    ))
 
 (register-handler-fx
   :request-permissions