Re-organize

Author: vutran1710

delay.sh

@@ -7,7 +7,7 @@ cmd="$@"
 
 until curl $BOOT_NODE; do
     >&2 echo "Boot is unavailable - sleeping"
-    sleep 10
+    sleep 5
 done
 
 >&2 echo "Boot is up - executing command"

project.clj

@@ -4,7 +4,6 @@
   :min-lein-version "2.0.0"
   :dependencies [[org.clojure/clojure "1.8.0"]
                  [compojure "1.5.1"]
-                 [ring/ring-defaults "0.2.1"]
                  [digest "1.4.8"]
                  [ring/ring-json "0.4.0"]
                  [clj-http "3.9.0"]]

src/blockchain/agent.clj

@@ -1,19 +1,23 @@
 (ns blockchain.agent
   (:require [clj-http.client :as client]
-            [clojure.string :refer [starts-with?]]
             [blockchain.init :refer :all]
-            [blockchain.worker :refer
-             [resolve-chain-conflict
-              remove-from-nodes
-              update-node-list
-              add-node]]))
+            [blockchain.helper :refer [fix-prc]]
+            [blockchain.worker :refer [resolve-chain-conflict]]))
 
 
-(defn- fix-prc [addr]
-  (if (starts-with? addr "http")
-    addr
-    (str "http://" addr)))
+;; Behind-the-scene works
+(defn- add-node [address]
+  (when-not (or (.contains @nodes address)
+                (= address "0:0:0:0:0:0:0:1")
+                (= address (System/getenv "GATEWAY")))
+    (swap! nodes conj address)))
 
+(defn- remove-from-nodes [node]
+  (->> (remove #(= node %) @nodes)
+       (reset! nodes)))
+
+(defn- update-node-list [remote-nodes]
+  (run! add-node remote-nodes))
 
 (defn- submit-chain [addr]
   (when (string? addr)
@@ -27,14 +31,16 @@
                                (remove-from-nodes addr))))
       (catch Exception e (remove-from-nodes addr)))))
 
-(defn broadcast []
-  "Submit the new chain to other nodes in the network."
-  (run! submit-chain @nodes))
-
 (defn- update-node-chain [{:keys [chain nodes]}]
   (resolve-chain-conflict chain)
   (update-node-list nodes))
 
+
+;; Public services
+(defn broadcast []
+  "Submit the new chain to other nodes in the network."
+  (run! submit-chain @nodes))
+
 (defn fetch-remote-chain [address]
   (println "Fetching from >>" address)
   (try

src/blockchain/core.clj

@@ -3,10 +3,9 @@
             [compojure.route :as route]
             [compojure.handler :as handler]
             [clojure.walk :refer [keywordize-keys]]
-            [ring.middleware.defaults :refer [wrap-defaults site-defaults]]
             [ring.middleware.json :refer [wrap-json-response wrap-json-body]]
             [ring.util.response :as resp]
-            [blockchain.init :refer [chain nodes]]
+            [blockchain.init :refer :all]
             [blockchain.worker :as worker]
             [blockchain.agent :as agent]))
 
@@ -23,6 +22,7 @@
   (POST "/" {chain :body}
         (do (println "Someone is submitting a chain...")
             (-> (keywordize-keys chain)
+                (vec)
                 (worker/resolve-chain-conflict)))
         (generate-response {:status 200}))
   (GET "/update" [] (do (run! agent/fetch-remote-chain @nodes)

src/blockchain/helper.clj

@@ -1,9 +1,8 @@
-(ns blockchain.helper)
+(ns blockchain.helper
+  (:require [clojure.string :refer [starts-with?]]))
 
-(defn add-tail [vect item]
-  "Conj is consistent about where to add new element."
-  "Make our own function to do that."
-  (vec (concat vect [item])))
+(defn now []
+  (quot (System/currentTimeMillis) 1000))
 
 (defn fix-prc [addr]
   "Fix address without http protocol"

src/blockchain/init.clj

@@ -1,13 +1,10 @@
 (ns blockchain.init
-  (:require [digest :refer [sha-256]]
-            [clojure.java.io :refer [as-url]]))
+  (:require [blockchain.helper :refer [now]]))
 
-(defn now [] (quot (System/currentTimeMillis) 1000))
 
-(def genesis-block {:index 1
-                    :time (now)
-                    :proof "vutr.io"})
+(defonce ^:private genesis-block {:index 1
+                                  :time (now)
+                                  :proof "vutr.io"})
 
 (def chain (atom [genesis-block]))
-(def current-transactions (atom []))
 (def nodes (atom []))

src/blockchain/worker.clj

@@ -1,11 +1,8 @@
 (ns blockchain.worker
   (:require [blockchain.init :refer :all]
             [digest :refer [sha-256]]
-            [clojure.java.io :refer [as-url]]))
+            [blockchain.helper :refer [now]]))
 
-(defn- add-tail [vect item]
-  "Conj is consistent about where to add new element. Make our own function to do that."
-  (vec (concat vect [item])))
 
 (defn- hashing-block [block]
   (sha-256 (str block)))
@@ -36,16 +33,6 @@
         (recur (inc id) (inc idx)) false)
       true)))
 
-(defn add-node [address]
-  (when-not (or (.contains @nodes address)
-                (= address "0:0:0:0:0:0:0:1")
-                (= address (System/getenv "GATEWAY")))
-    (swap! nodes conj address)))
-
-(defn remove-from-nodes [node]
-  (->> (remove #(= node %) @nodes)
-       (reset! nodes)))
-
 (defn forge-new-block []
   (let [last-block (last @chain)]
     {:index (inc (count @chain))
@@ -57,7 +44,7 @@
   (let [proof (:proof block)
         last-hashed (hashing-block (last @chain))]
     (when (validate-proof proof last-hashed)
-      (do (swap! chain add-tail block) chain))))
+      (do (swap! chain conj block) chain))))
 
 (defn resolve-chain-conflict [remote-chain]
   "Chain with greater length will replace the existing chain."
@@ -67,6 +54,3 @@
       (when (validate-chain remote-chain)
         (do (reset! chain remote-chain)
             (println "Applied new chain..."))))))
-
-(defn update-node-list [remote-nodes]
-  (run! add-node remote-nodes))