smaller commit :)

src/clj/skirmish/bookkeeper/bookkeeper.clj

@@ -7,7 +7,6 @@
             [skirmish.order]  ;; for spec side effect
             [skirmish.rest.util :refer [build-response build-response-body]]
             [clojure.spec.alpha :as s]
-            [kinsky.client]
             [slingshot.slingshot :refer [try+ throw+]]
             [clojure.core.async :refer [chan go-loop close! <! sub]]))
 

src/clj/skirmish/bookkeeper/core.clj

@@ -2,7 +2,6 @@
   (:require [org.httpkit.server :refer [run-server]]
             [compojure.handler :refer [api]]
             [skirmish.util :refer [block-thread]]
-            [skirmish.middleware.core :refer [create-exchange-apis-for]]
             [skirmish.bookkeeper.bookkeeper :refer [create-routes-for-bookkeeper]]
             [ring.middleware.cors :refer [wrap-cors]]))
 

src/clj/skirmish/exchange/core.clj

@@ -1,9 +1,8 @@
 (ns skirmish.exchange.core
   (:require [skirmish.util :refer [block-thread]]
             [skirmish.middleware.core :refer [create-exchange-apis-for]]
-            [skirmish.exchange.exchange :refer [create-exchange-for-security empty-book]]
-            [kinsky.async]
-            [kinsky.client]))
+            [skirmish.exchange.exchange :refer [create-exchange-for-security empty-book]]))
+
 
 (defn create-exchange-for [exchange-api]
   (let [initial-book empty-book

src/clj/skirmish/exchange_gateway/core.clj

@@ -2,7 +2,6 @@
   (:require [org.httpkit.server :refer [run-server]]
             [compojure.handler :refer [api]]
             [skirmish.util :refer [block-thread]]
-            [skirmish.middleware.core :refer [create-exchange-apis-for]]
             [skirmish.exchange-gateway.exchange-gateway :refer [create-routes-for-exchange]]
             [ring.middleware.cors :refer [wrap-cors]]))
 

src/clj/skirmish/ledger/accounts.clj

@@ -48,6 +48,31 @@
     :db/cardinality :db.cardinality/one
     :db/unique :db.unique/identity
     :db/doc "The sec id."}
+   {
+    :db/ident :skirmish.security/type
+    :db/valueType :db.type/keyword
+    :db/cardinality :db.cardinality/one
+    :db/unique :db.unique/identity
+    :db/doc "The type of security.  For instance :equity or :currency."}
+
+   {
+    :db/ident :skirmish.security/description
+    :db/valueType :db.type/string
+    :db/cardinality :db.cardinality/one
+    :db/unique :db.unique/identity
+    :db/doc "The description of the currency.  Please be verbose."}
+   {
+    :db/ident :skirmish.security/emitter
+    :db/valueType :db.type/string
+    :db/cardinality :db.cardinality/one
+    :db/unique :db.unique/identity
+    :db/doc "The public key of the emmiter.  This is not yet supported."}
+   {
+    :db/ident :skirmish.security/symbol
+    :db/valueType :db.type/string
+    :db/cardinality :db.cardinality/one
+    :db/unique :db.unique/identity
+    :db/doc "The symbol of the security for pretty printing."}
    {
     :db/ident :skirmish.security/interest-rate
     :db/valueType :db.type/long

src/clj/skirmish/ledger/core.clj

@@ -4,7 +4,6 @@
             [skirmish.util :refer [block-thread]]
             [slingshot.slingshot :refer [try+ throw+]]
             [compojure.route :refer [not-found]]
-            [skirmish.middleware.core :refer [create-exchange-apis-for]]
             [skirmish.exchange-gateway.exchange-gateway :refer [create-routes-for-exchange]]
             [skirmish.rest.util :refer [build-response get-body]]
             [skirmish.ledger.accounts]
@@ -52,7 +51,12 @@
 
 
 (s/def ::security (s/cat :sec-id keyword?
-                         :interest-rate nat-int?))
+                         :interest-rate nat-int?
+                         :type #{:equity :currency}
+                         :description string?
+                         :emitter string?
+                         :symbol (s/? string?)))
+
 
 (defn get-new-security [raw-securities]
   (if (s/valid? ::security raw-securities)

src/clj/skirmish/middleware/core.clj

@@ -1,6 +1,5 @@
 (ns skirmish.middleware.core
   (:require [clojure.core.async :as async]
-            [skirmish.exchange.exchange :refer [empty-book create-exchange-for-security]] ;; remove this import.
             [kinsky.async]
             [kinsky.client]))