From d22f0515d5b862ca2df9c546a58de9c15a5079ac Mon Sep 17 00:00:00 2001 From: didier amyot Date: Mon, 25 Jun 2018 11:09:27 -0400 Subject: [PATCH] refactored main project name --- .gitignore | 1 + book.iml | 76 ------------------- project.clj | 4 +- src/book/cli/core.clj | 1 - src/book/rest/marketdata.clj | 1 - src/book/util.clj | 9 --- .../PersistentSortedList.java | 2 +- src/skirmish/cli/core.clj | 1 + src/{book => skirmish}/cli/exchange.clj | 10 +-- src/{book => skirmish}/core.clj | 8 +- src/{book => skirmish}/exchange.clj | 12 +-- src/{book => skirmish}/match.clj | 4 +- src/{book => skirmish}/order.clj | 12 +-- src/{book => skirmish}/rest/core.clj | 6 +- src/{book => skirmish}/rest/exchange.clj | 10 +-- src/skirmish/rest/marketdata.clj | 1 + src/{book => skirmish}/rest/util.clj | 2 +- src/skirmish/util.clj | 9 +++ test/{book => skirmish}/exchange_test.clj | 12 +-- test/{book => skirmish}/match_test.clj | 8 +- test/{book => skirmish}/rest/util_test.clj | 4 +- .../test_PersistentSortedList.clj | 6 +- 22 files changed, 62 insertions(+), 137 deletions(-) delete mode 100644 book.iml delete mode 100644 src/book/cli/core.clj delete mode 100644 src/book/rest/marketdata.clj delete mode 100644 src/book/util.clj rename src/java/{book => skirmish}/PersistentSortedList.java (99%) create mode 100644 src/skirmish/cli/core.clj rename src/{book => skirmish}/cli/exchange.clj (86%) rename src/{book => skirmish}/core.clj (71%) rename src/{book => skirmish}/exchange.clj (86%) rename src/{book => skirmish}/match.clj (98%) rename src/{book => skirmish}/order.clj (69%) rename src/{book => skirmish}/rest/core.clj (68%) rename src/{book => skirmish}/rest/exchange.clj (94%) create mode 100644 src/skirmish/rest/marketdata.clj rename src/{book => skirmish}/rest/util.clj (98%) create mode 100644 src/skirmish/util.clj rename test/{book => skirmish}/exchange_test.clj (92%) rename test/{book => skirmish}/match_test.clj (97%) rename test/{book => skirmish}/rest/util_test.clj (95%) rename test/{book => skirmish}/test_PersistentSortedList.clj (91%) diff --git a/.gitignore b/.gitignore index 37685b9..e25ba41 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ pom.xml.asc .hg/ .idea/ book.iml +skirmish.iml diff --git a/book.iml b/book.iml deleted file mode 100644 index e8353b5..0000000 --- a/book.iml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/project.clj b/project.clj index e2bcf53..a127613 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject book "0.1.0-SNAPSHOT" +(defproject skirmish "0.1.0-SNAPSHOT" :description "FIXME: write description" :url "http://example.com/FIXME" :license {:name "Eclipse Public License" @@ -15,7 +15,7 @@ [slingshot "0.12.2"] [cheshire "5.8.0"]] :java-source-paths ["src/java"] - :main ^:skip-aot book.core + :main ^:skip-aot skirmish.core :target-path "target/%s" :plugins [[lein-midje "3.2.1"]] :profiles { diff --git a/src/book/cli/core.clj b/src/book/cli/core.clj deleted file mode 100644 index c41bc55..0000000 --- a/src/book/cli/core.clj +++ /dev/null @@ -1 +0,0 @@ -(ns book.cli.core) diff --git a/src/book/rest/marketdata.clj b/src/book/rest/marketdata.clj deleted file mode 100644 index 31c2803..0000000 --- a/src/book/rest/marketdata.clj +++ /dev/null @@ -1 +0,0 @@ -(ns book.rest.marketdata) diff --git a/src/book/util.clj b/src/book/util.clj deleted file mode 100644 index de87dd7..0000000 --- a/src/book/util.clj +++ /dev/null @@ -1,9 +0,0 @@ -(ns book.util - (:import [book.PersistentSortedList])) - -(defn sorted-list [& keys] - (book.PersistentSortedList/create (seq keys))) - -(defn sorted-list-by [comparator & keys] - (book.PersistentSortedList/create comparator (seq keys))) - diff --git a/src/java/book/PersistentSortedList.java b/src/java/skirmish/PersistentSortedList.java similarity index 99% rename from src/java/book/PersistentSortedList.java rename to src/java/skirmish/PersistentSortedList.java index 5cc06c3..a7c0cea 100644 --- a/src/java/book/PersistentSortedList.java +++ b/src/java/skirmish/PersistentSortedList.java @@ -1,4 +1,4 @@ -package book; +package skirmish; import clojure.lang.*; import java.util.*; diff --git a/src/skirmish/cli/core.clj b/src/skirmish/cli/core.clj new file mode 100644 index 0000000..0031fc8 --- /dev/null +++ b/src/skirmish/cli/core.clj @@ -0,0 +1 @@ +(ns skirmish.cli.core) diff --git a/src/book/cli/exchange.clj b/src/skirmish/cli/exchange.clj similarity index 86% rename from src/book/cli/exchange.clj rename to src/skirmish/cli/exchange.clj index d63a404..7d413ff 100644 --- a/src/book/cli/exchange.clj +++ b/src/skirmish/cli/exchange.clj @@ -1,8 +1,8 @@ -(ns book.cli.exchange - (:require [book.match :refer [sell?]] - [book.util :refer :all] - [book.exchange :refer [empty-book create-exchange-for-security]] - [book.order] ;; for spec side effect +(ns skirmish.cli.exchange + (:require [skirmish.match :refer [sell?]] + [skirmish.util :refer :all] + [skirmish.exchange :refer [empty-book create-exchange-for-security]] + [skirmish.order] ;; for spec side effect [slingshot.slingshot :refer [try+ throw+]] [clojure.edn :as edn] [clojure.core.async :refer [chan go >!! "config.edn" clojure.java.io/resource read-config) diff --git a/src/book/exchange.clj b/src/skirmish/exchange.clj similarity index 86% rename from src/book/exchange.clj rename to src/skirmish/exchange.clj index 9856d89..e832dd7 100644 --- a/src/book/exchange.clj +++ b/src/skirmish/exchange.clj @@ -1,9 +1,9 @@ -(ns book.exchange - (:require [book.match :refer [sell? - create-buy-book - create-sell-book - match-order-in-book]] - [book.util :refer :all] +(ns skirmish.exchange + (:require [skirmish.match :refer [sell? + create-buy-book + create-sell-book + match-order-in-book]] + [skirmish.util :refer :all] [clojure.core.async :refer [chan go >! !! sub]] diff --git a/src/skirmish/rest/marketdata.clj b/src/skirmish/rest/marketdata.clj new file mode 100644 index 0000000..cb203ea --- /dev/null +++ b/src/skirmish/rest/marketdata.clj @@ -0,0 +1 @@ +(ns skirmish.rest.marketdata) diff --git a/src/book/rest/util.clj b/src/skirmish/rest/util.clj similarity index 98% rename from src/book/rest/util.clj rename to src/skirmish/rest/util.clj index 6b7ab1b..2d08646 100644 --- a/src/book/rest/util.clj +++ b/src/skirmish/rest/util.clj @@ -1,4 +1,4 @@ -(ns book.rest.util +(ns skirmish.rest.util (:require [cheshire.core :refer [generate-string]] [clojure.string :refer [split starts-with? ends-with?]])) diff --git a/src/skirmish/util.clj b/src/skirmish/util.clj new file mode 100644 index 0000000..18483f5 --- /dev/null +++ b/src/skirmish/util.clj @@ -0,0 +1,9 @@ +(ns skirmish.util + (:import [skirmish.PersistentSortedList])) + +(defn sorted-list [& keys] + (skirmish.PersistentSortedList/create (seq keys))) + +(defn sorted-list-by [comparator & keys] + (skirmish.PersistentSortedList/create comparator (seq keys))) + diff --git a/test/book/exchange_test.clj b/test/skirmish/exchange_test.clj similarity index 92% rename from test/book/exchange_test.clj rename to test/skirmish/exchange_test.clj index 1b321ed..22752b2 100644 --- a/test/book/exchange_test.clj +++ b/test/skirmish/exchange_test.clj @@ -1,11 +1,11 @@ -(ns book.exchange-test - (:import [book.PersistentSortedList]) +(ns skirmish.exchange-test + (:import [skirmish.PersistentSortedList]) (:require [midje.sweet :refer :all] - [book.exchange :refer :all] - [book.match :refer [create-buy-book - create-sell-book]])) + [skirmish.exchange :refer :all] + [skirmish.match :refer [create-buy-book + create-sell-book]])) -(def PersistentSortedList? (comp #(= % book.PersistentSortedList) type)) +(def PersistentSortedList? (comp #(= % skirmish.PersistentSortedList) type)) (facts "the exchange as an whole" (fact "process-sell-order should work when book empty" diff --git a/test/book/match_test.clj b/test/skirmish/match_test.clj similarity index 97% rename from test/book/match_test.clj rename to test/skirmish/match_test.clj index f5f3263..8904ae2 100644 --- a/test/book/match_test.clj +++ b/test/skirmish/match_test.clj @@ -1,8 +1,8 @@ -(ns book.match-test +(ns skirmish.match-test (:require [midje.sweet :refer :all] - [book.match :refer :all])) + [skirmish.match :refer :all])) -(def PersistentSortedList? (comp #(= % book.PersistentSortedList) type)) +(def PersistentSortedList? (comp #(= % skirmish.PersistentSortedList) type)) (facts "matching buy order in sell book" @@ -112,7 +112,7 @@ order {:type :sell :quantity 21 :price 13 :book.order/id 118} [_ new-book _] (match-order-in-book book order)] (count new-book) => 0 - (type new-book) => book.PersistentSortedList))) + (type new-book) => skirmish.PersistentSortedList))) ;(fact "should not fuck up" ; (let [order-1 {:type :buy :quantity 4 :price 4 :book.order/id 5} ; order-2 {:type :sell :quantity 2 :price 3 :book.order/id 6} diff --git a/test/book/rest/util_test.clj b/test/skirmish/rest/util_test.clj similarity index 95% rename from test/book/rest/util_test.clj rename to test/skirmish/rest/util_test.clj index 42ace8c..952a02c 100644 --- a/test/book/rest/util_test.clj +++ b/test/skirmish/rest/util_test.clj @@ -1,5 +1,5 @@ -(ns book.rest.util-test - (:require [book.rest.util :refer [build-response]] +(ns skirmish.rest.util-test + (:require [skirmish.rest.util :refer [build-response]] [midje.sweet :refer :all] [clojure.test :refer :all])) diff --git a/test/book/test_PersistentSortedList.clj b/test/skirmish/test_PersistentSortedList.clj similarity index 91% rename from test/book/test_PersistentSortedList.clj rename to test/skirmish/test_PersistentSortedList.clj index c6d66d0..f4d90c7 100644 --- a/test/book/test_PersistentSortedList.clj +++ b/test/skirmish/test_PersistentSortedList.clj @@ -1,6 +1,6 @@ -(ns book.test-PersistentSortedList +(ns skirmish.test-PersistentSortedList (:require [midje.sweet :refer :all] - [book.util :refer [sorted-list sorted-list-by]])) + [skirmish.util :refer [sorted-list sorted-list-by]])) @@ -21,7 +21,7 @@ (rest (sorted-list 1 2 3 2)) => (sorted-list 2 2 3) (rest (sorted-list 1)) => (sorted-list) (rest (sorted-list)) => empty? - (str (type (rest (sorted-list)))) => "class book.PersistentSortedList") + (str (type (rest (sorted-list)))) => "class skirmish.PersistentSortedList") (fact "next" (next (sorted-list 1 2 3)) => (sorted-list 2 3) (next (sorted-list 1 2 3 2)) => (sorted-list 2 2 3)