some large-ish refactoring

src/skirmish/cli/exchange.clj

@@ -1,7 +1,7 @@
 (ns skirmish.cli.exchange
-  (:require [skirmish.match :refer [sell?]]
+  (:require [skirmish.exchange.match :refer [sell?]]
     [skirmish.util :refer :all]
-    [skirmish.exchange :refer [empty-book create-exchange-for-security]]
+    [skirmish.exchange.exchange :refer [empty-book create-exchange-for-security]]
     [skirmish.order]  ;; for spec side effect
     [slingshot.slingshot :refer [try+ throw+]]
     [clojure.edn :as edn]

src/skirmish/core.clj

@@ -2,13 +2,13 @@
   (:require [skirmish.cli.core]
             [skirmish.rest.core]
             [skirmish.cli.benchmark]
-            [skirmish.kafka.exchange-simulator]
             [aero.core :refer (read-config)])
   (:gen-class))
 
-(def apps {:webserver skirmish.rest.core/-main
-           :benchmark skirmish.cli.benchmark/-main
-           :kafka-exchange-simulator skirmish.kafka.exchange-simulator/-main})
+(def apps {:api-server skirmish.rest.core/api-main
+           :exchange-core skirmish.rest.core/api-main ;; should be skirmish.exchange.core/api-main
+           :benchmark skirmish.cli.benchmark/-main})
+
 
 (defn -main [& argv]
   (let [config (-> "config.edn" clojure.java.io/resource read-config)

src/skirmish/exchange/exchange.clj

@@ -1,8 +1,8 @@
-(ns skirmish.exchange
-  (:require [skirmish.match :refer [sell?
-                                    create-buy-book
-                                    create-sell-book
-                                    match-order-in-book]]
+(ns skirmish.exchange.exchange
+  (:require [skirmish.exchange.match :refer [sell?
+                                             create-buy-book
+                                             create-sell-book
+                                             match-order-in-book]]
             [skirmish.util :refer :all]
             [clojure.core.async :refer [chan go >! <! pub] :as async]))
 

src/skirmish/exchange/match.clj

@@ -1,4 +1,4 @@
-(ns skirmish.match
+(ns skirmish.exchange.match
   (:require [skirmish.util :refer [sorted-list-by]]
             [clojure.spec.alpha :as s]
             [clojure.edn :as edn]))

src/skirmish/rest/core.clj

@@ -5,7 +5,7 @@
             [skirmish.rest.exchange :refer [create-exchanges-api-for
                                             create-routes]]))
 
-(defn -main [config]
+(defn api-main [config]
   (let [webserver-config (:webserver config)
         exchange-apis (create-exchanges-api-for (:securities config))
         kafka-producer (kinsky.client/producer {:bootstrap.servers (get-in config [:kafka :bootstrap.servers])}

src/skirmish/rest/exchange.clj

@@ -1,11 +1,10 @@
 (ns skirmish.rest.exchange
-  (:require [skirmish.exchange :refer [empty-book]]
+  (:require [skirmish.exchange.exchange :refer [empty-book create-exchange-for-security]]
             [org.httpkit.server :refer [run-server with-channel send! close on-close]]
             [compojure.route :refer [not-found]]
             [compojure.handler :refer [api]]
             [compojure.core :refer :all]
             [skirmish.order]  ;; for spec side effect
-            [skirmish.exchange :refer [create-exchange-for-security]]
             [skirmish.rest.util :refer [build-response build-response-body]]
             [clojure.spec.alpha :as s]
             [kinsky.client]