From a8ae9336042acdbd9a0d1c8c67cc8dd0147da552 Mon Sep 17 00:00:00 2001 From: Andrea Maria Piana Date: Wed, 24 Mar 2021 16:05:31 +0100 Subject: [PATCH] Revert "Anon metrics transfer" This reverts commit 2abd430e029a8c6c16adde7b7ec8cca7fbf3a961. --- src/status_im/anon_metrics/interceptors.cljs | 27 -------------------- src/status_im/anon_metrics/transformers.cljs | 17 ------------ src/status_im/ethereum/json_rpc.cljs | 3 +-- src/status_im/navigation.cljs | 9 +++---- 4 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 src/status_im/anon_metrics/interceptors.cljs delete mode 100644 src/status_im/anon_metrics/transformers.cljs diff --git a/src/status_im/anon_metrics/interceptors.cljs b/src/status_im/anon_metrics/interceptors.cljs deleted file mode 100644 index 20d13566a6..0000000000 --- a/src/status_im/anon_metrics/interceptors.cljs +++ /dev/null @@ -1,27 +0,0 @@ -(ns status-im.anon-metrics.interceptors - (:require [status-im.ethereum.json-rpc :as json-rpc] - [taoensso.timbre :as log] - [re-frame.interceptor :refer [->interceptor]] - [status-im.utils.platform :as platform] - [status-im.utils.build :as build] - [status-im.anon-metrics.transformers :as txf])) - -(defn transform-and-log [context] - (log/info :catch-event-fn (get-in context [:coeffects :event])) - (when-let [transformed-payload (txf/transform context)] - (json-rpc/call {:method "appmetrics_saveAppMetrics" - :params [[{:event (-> context :coeffects :event first) - :value transformed-payload - :app_version build/version - :os platform/os}]] - :on-failure log/error}))) - -(defn catch-events-before [context] - (log/info "catch-events/interceptor fired") - (transform-and-log context) - context) - -(def catch-events - (->interceptor - :id :catch-events - :before catch-events-before)) diff --git a/src/status_im/anon_metrics/transformers.cljs b/src/status_im/anon_metrics/transformers.cljs deleted file mode 100644 index b68c3774bc..0000000000 --- a/src/status_im/anon_metrics/transformers.cljs +++ /dev/null @@ -1,17 +0,0 @@ -(ns status-im.anon-metrics.transformers - "`status-go` defines the shape of expected events so that we don't overcollect data (by mistake or intentionally). - `transformers` ns transform the event payload to match the expected shape on `status-go` side.") - -(defn navigate-to-txf [event] - {:view-id (second event) - :params (-> event - (nth 2) - (select-keys [:screen]))}) - -(def transformations - {:navigate-to navigate-to-txf}) - -(defn transform [ctx] - (let [event (-> ctx :coeffects :event)] - (when-let [txf (-> event first transformations)] - (txf event)))) diff --git a/src/status_im/ethereum/json_rpc.cljs b/src/status_im/ethereum/json_rpc.cljs index b810c0b503..2b04db899e 100644 --- a/src/status_im/ethereum/json_rpc.cljs +++ b/src/status_im/ethereum/json_rpc.cljs @@ -178,8 +178,7 @@ "mailservers_addChatRequestRange" {} "mailservers_addChatRequestRanges" {} "mailservers_getChatRequestRanges" {} - "mailservers_deleteChatRequestRange" {} - "appmetrics_saveAppMetrics" {}}) + "mailservers_deleteChatRequestRange" {}}) (defn on-error-retry [call-method {:keys [method number-of-retries delay on-error] :as arg}] diff --git a/src/status_im/navigation.cljs b/src/status_im/navigation.cljs index b872bdab30..5393842304 100644 --- a/src/status_im/navigation.cljs +++ b/src/status_im/navigation.cljs @@ -2,8 +2,7 @@ (:require [re-frame.core :as re-frame] [status-im.ui.screens.routing.core :as navigation] [taoensso.timbre :as log] - [status-im.utils.fx :as fx] - [status-im.anon-metrics.interceptors :as anon-metrics])) + [status-im.utils.fx :as fx])) (re-frame/reg-fx ::navigate-to @@ -45,8 +44,7 @@ ::navigate-to [go-to-view-id screen-params]}) (fx/defn navigate-to - {:events [:navigate-to] - :interceptors [anon-metrics/catch-events]} + {:events [:navigate-to]} [cofx go-to-view-id screen-params] (navigate-to-cofx cofx go-to-view-id screen-params)) @@ -61,8 +59,7 @@ {::navigate-reset config}) (fx/defn navigate-replace - {:events [:navigate-replace] - :interceptors [anon-metrics/catch-events]} + {:events [:navigate-replace]} [{:keys [db]} go-to-view-id screen-params] (let [db (cond-> (assoc db :view-id go-to-view-id) (seq screen-params)