refactor: remove src/rtc_e2e_test

rtc-e2e-test already moved to clj-e2e

Author: RCmerci

.carve/config.edn

@@ -1,6 +1,6 @@
 {;; Only lint production namespaces as most dev
  ;; namespaces are unused
- :paths ["src/main" "src/electron" "src/test" "src/rtc_e2e_test"]
+ :paths ["src/main" "src/electron" "src/test"]
  :api-namespaces [;; Ignore b/c too many false positives
                   frontend.db
                   ;; Used for debugging

bb.edn

@@ -164,9 +164,6 @@
   dev:lint-and-test
   logseq.tasks.dev/lint-and-test
 
-  dev:rtc-e2e-test
-  logseq.tasks.dev/rtc-e2e-test
-
   dev:gen-malli-kondo-config
   logseq.tasks.dev/gen-malli-kondo-config
 

deps.edn

@@ -68,10 +68,6 @@
                                 cider/cider-nrepl                {:mvn/version "0.55.1"}}
                   :main-opts   ["-m" "shadow.cljs.devtools.cli"]}
 
-           :rtc-e2e-test {:extra-paths ["src/rtc_e2e_test"]
-                          :extra-deps {cider/cider-nrepl                {:mvn/version "0.50.2"}}
-                          :main-opts ["-m" "shadow.cljs.devtools.cli"]}
-
            :bench {:extra-paths ["src/bench/"]
                    :extra-deps {olical/cljs-test-runner {:mvn/version "3.8.0"}
                                 fipp/fipp {:mvn/version "0.6.26"}}

karma.conf.js

@@ -26,17 +26,6 @@
   (dev-lint/dev)
   (test "-e" "long" "-e" "fix-me"))
 
-(defn rtc-e2e-test
-  "Run karma rtc-e2e-test"
-  [& [skip-compile?]]
-  (let [seed (hash (rand))
-        r0 (when-not skip-compile? (shell (str "clj -M:rtc-e2e-test compile rtc-e2e-test")))
-        c1 (async/go (shell (str "npx karma start --testvar=client1 --single-run --seed=" seed)))
-        c2 (async/go (shell (str "npx karma start --testvar=client2 --single-run --seed=" seed)))]
-    (when (and r0 (not= 0 (:exit r0)))
-      (throw (ex-info "compile failed" {:r r0})))
-    (prn :exit-code :client1 (:exit (async/<!! c1)) :client2 (:exit (async/<!! c2)))))
-
 (defn gen-malli-kondo-config
   "Generate clj-kondo type-mismatch config from malli schema
   .clj-kondo/metosin/malli-types/config.edn"

scripts/src/logseq/tasks/dev.clj

@@ -6,8 +6,7 @@
 
  ;; "." for /static
  :dev-http {3001 ["static" "."]
-            3002 "static/mobile"
-            8021 "static/rtc-e2e-test"}
+            3002 "static/mobile"}
 
  :js-options {:js-package-dirs ["node_modules" "packages/tldraw/apps"]}
 
@@ -174,14 +173,6 @@
          :compiler-options {:static-fns false}
          :main frontend.test.frontend-node-test-runner/main}
 
-  :rtc-e2e-test {:target :karma
-                 :closure-defines {frontend.worker.rtc.const/RTC-E2E-TEST* true}
-                 :output-to "static/rtc-e2e-test/main.js"
-                 :devtools {:enabled true}
-                 :compiler-options {:source-map true
-                                    :warnings {:fn-deprecated false
-                                               :redef false}}}
-
   :gen-malli-kondo-config {:target :node-script
                            :closure-defines {frontend.util/NODETEST true}
                            :devtools {:enabled false}

shadow-cljs.edn

@@ -131,11 +131,12 @@
   (let [cancel (task (or succ (constantly nil)) (or fail fail-case-default-handler))]
     #(cancel)))
 
-(defn run-task-throw
-  "Return the canceler"
-  [key' task & {:keys [succ]}]
-  (let [cancel (task (or succ #(log/info :key key' :succ %)) #(throw (ex-info "task stopped" {:key key' :e %})))]
-    #(cancel)))
+(comment
+  (defn run-task-throw
+    "Return the canceler"
+    [key' task & {:keys [succ]}]
+    (let [cancel (task (or succ #(log/info :key key' :succ %)) #(throw (ex-info "task stopped" {:key key' :e %})))]
+      #(cancel))))
 
 (defonce ^:private *background-task-cancelers ; key -> canceler
   (volatile! {}))

src/main/frontend/common/missionary.cljs

@@ -4,9 +4,6 @@
             [logseq.db.frontend.kv-entity :as kv-entity]
             [logseq.db.frontend.property :as db-property]))
 
-(goog-define RTC-E2E-TEST* false)
-(def RTC-E2E-TEST RTC-E2E-TEST*)
-
 (defkeywords
   :rtc/ignore-attr-when-init-upload
   {:doc "keyword option for RTC. ignore this *attr* when initial uploading graph. Default false"}

src/main/frontend/worker/rtc/const.cljs

@@ -8,7 +8,6 @@
             [frontend.common.thread-api :as thread-api]
             [frontend.worker-common.util :as worker-util]
             [frontend.worker.crypt :as crypt]
-            [frontend.worker.db-listener :as db-listener]
             [frontend.worker.db-metadata :as worker-db-metadata]
             [frontend.worker.rtc.client-op :as client-op]
             [frontend.worker.rtc.const :as rtc-const]
@@ -20,8 +19,6 @@
             [lambdaisland.glogi :as log]
             [logseq.db :as ldb]
             [logseq.db.frontend.malli-schema :as db-malli-schema]
-            [logseq.db.frontend.schema :as db-schema]
-            [logseq.db.sqlite.create-graph :as sqlite-create-graph]
             [logseq.db.sqlite.util :as sqlite-util]
             [logseq.outliner.pipeline :as outliner-pipeline]
             [malli.core :as ma]
@@ -161,8 +158,7 @@
             (client-op/remove-local-tx repo)
             (client-op/add-all-exists-asset-as-ops repo)
             (crypt/store-graph-keys-jwk repo aes-key-jwk)
-            (when-not rtc-const/RTC-E2E-TEST
-              (c.m/<? (worker-db-metadata/<store repo (pr-str {:kv/value graph-uuid}))))
+            (c.m/<? (worker-db-metadata/<store repo (pr-str {:kv/value graph-uuid})))
             (rtc-log-and-state/rtc-log :rtc.log/upload {:sub-type :upload-completed
                                                         :message "upload-graph completed"})
             {:graph-uuid graph-uuid})
@@ -269,29 +265,6 @@
        [schema-blocks (conj normal-blocks block)]))
    [[] []] blocks))
 
-(defn- create-graph-for-rtc-test
-  "TODO: remove this fn
-  it's complex to setup db-worker related stuff, when I only want to test rtc related logic"
-  [repo init-tx-data other-tx-data]
-  (let [conn (d/create-conn db-schema/schema)
-        db-initial-data (sqlite-create-graph/build-db-initial-data "")]
-    (swap! worker-state/*datascript-conns assoc repo conn)
-    (d/transact! conn db-initial-data {:initial-db? true
-                                       :frontend.worker.pipeline/skip-store-conn rtc-const/RTC-E2E-TEST})
-    (db-listener/listen-db-changes! repo conn)
-    (d/transact! conn init-tx-data {:rtc-download-graph? true
-                                    :gen-undo-ops? false
-                                    ;; only transact db schema, skip validation to avoid warning
-                                    :frontend.worker.pipeline/skip-validate-db? true
-                                    :frontend.worker.pipeline/skip-store-conn rtc-const/RTC-E2E-TEST
-                                    :persist-op? false})
-    (d/transact! conn other-tx-data {:rtc-download-graph? true
-                                     :gen-undo-ops? false
-                                     :frontend.worker.pipeline/skip-store-conn rtc-const/RTC-E2E-TEST
-                                     :persist-op? false})
-    (transact-remote-schema-version! repo)
-    (<transact-block-refs! repo nil)))
-
 (defn- blocks-resolve-temp-id
   [schema-blocks blocks]
   (let [uuids (map :block/uuid blocks)
@@ -388,37 +361,35 @@
       (client-op/update-local-tx repo remote-t)
       (rtc-log-and-state/update-local-t graph-uuid remote-t)
       (rtc-log-and-state/update-remote-t graph-uuid remote-t)
-      (if rtc-const/RTC-E2E-TEST
-        (create-graph-for-rtc-test repo init-tx-data tx-data)
-        (c.m/<?
-         (p/do!
-          ((@thread-api/*thread-apis :thread-api/create-or-open-db) repo {:close-other-db? false})
-          ((@thread-api/*thread-apis :thread-api/export-db) repo)
-          (rtc-log-and-state/rtc-log :rtc.log/download {:sub-type :transact-graph-data-to-db-1
-                                                        :message (str "transacting init data(" (count init-tx-data) ")")
-                                                        :graph-uuid graph-uuid})
-          ((@thread-api/*thread-apis :thread-api/transact)
-           repo init-tx-data
-           {:rtc-download-graph? true
-            :gen-undo-ops? false
+      (c.m/<?
+       (p/do!
+        ((@thread-api/*thread-apis :thread-api/create-or-open-db) repo {:close-other-db? false})
+        ((@thread-api/*thread-apis :thread-api/export-db) repo)
+        (rtc-log-and-state/rtc-log :rtc.log/download {:sub-type :transact-graph-data-to-db-1
+                                                      :message (str "transacting init data(" (count init-tx-data) ")")
+                                                      :graph-uuid graph-uuid})
+        ((@thread-api/*thread-apis :thread-api/transact)
+         repo init-tx-data
+         {:rtc-download-graph? true
+          :gen-undo-ops? false
             ;; only transact db schema, skip validation to avoid warning
-            :frontend.worker.pipeline/skip-validate-db? true
-            :persist-op? false}
-           (worker-state/get-context))
-          (rtc-log-and-state/rtc-log :rtc.log/download {:sub-type :transact-graph-data-to-db-2
-                                                        :message (str "transacting other data(" (count tx-data) ")")
-                                                        :graph-uuid graph-uuid})
-          (p/doseq [tx-data* (partition-all 500 tx-data)]
-            ((@thread-api/*thread-apis :thread-api/transact)
-             repo tx-data* {:rtc-download-graph? true
-                            :gen-undo-ops? false
-                            :persist-op? false} (worker-state/get-context))
-            (p/delay 10))
-          (rtc-log-and-state/rtc-log :rtc.log/download {:sub-type :transact-graph-data-to-db-3
-                                                        :message "transacting remote schema version"
-                                                        :graph-uuid graph-uuid})
-          (transact-remote-schema-version! repo)
-          (<transact-block-refs! repo graph-uuid))))
+          :frontend.worker.pipeline/skip-validate-db? true
+          :persist-op? false}
+         (worker-state/get-context))
+        (rtc-log-and-state/rtc-log :rtc.log/download {:sub-type :transact-graph-data-to-db-2
+                                                      :message (str "transacting other data(" (count tx-data) ")")
+                                                      :graph-uuid graph-uuid})
+        (p/doseq [tx-data* (partition-all 500 tx-data)]
+          ((@thread-api/*thread-apis :thread-api/transact)
+           repo tx-data* {:rtc-download-graph? true
+                          :gen-undo-ops? false
+                          :persist-op? false} (worker-state/get-context))
+          (p/delay 10))
+        (rtc-log-and-state/rtc-log :rtc.log/download {:sub-type :transact-graph-data-to-db-3
+                                                      :message "transacting remote schema version"
+                                                      :graph-uuid graph-uuid})
+        (transact-remote-schema-version! repo)
+        (<transact-block-refs! repo graph-uuid)))
       (shared-service/broadcast-to-clients! :add-repo {:repo repo}))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -490,8 +461,7 @@
                                                             :message "transacted all blocks"
                                                             :graph-uuid graph-uuid})
               (client-op/update-graph-uuid repo graph-uuid)
-              (when-not rtc-const/RTC-E2E-TEST
-                (c.m/<? (worker-db-metadata/<store repo (pr-str {:kv/value graph-uuid}))))
+              (c.m/<? (worker-db-metadata/<store repo (pr-str {:kv/value graph-uuid})))
               (worker-state/set-rtc-downloading-graph! false)
               (rtc-log-and-state/rtc-log :rtc.log/download {:sub-type :download-completed
                                                             :message "download completed"
@@ -600,7 +570,4 @@
            datoms)))]
     (prn ::count (count refs-tx))
     ;; (prn ::take-20 (take 20 (sort-by second > (into [] (frequencies (map last refs-tx))))))
-    )
-
-
-  )
+    ))

src/main/frontend/worker/rtc/full_upload_download_graph.cljs

@@ -9,10 +9,6 @@
 
 (def ^:private *rtc-log (atom nil))
 
-(def rtc-log-flow
-  "used by rtc-e2e-test"
-  (m/watch *rtc-log))
-
 (def ^:private rtc-log-type-schema
   (vec
    (concat