From 2461319e57f1343a271c9866fd58b314d88f4071 Mon Sep 17 00:00:00 2001
From: Simon Brooke <simon@journeyman.cc>
Date: Wed, 9 Jun 2021 15:58:58 +0100
Subject: [PATCH] Mainly fixing linter (kondo) whines.

---
 src/cc/journeyman/the_great_game/gossip/news_items.clj        | 2 +-
 test/cc/journeyman/the_great_game/gossip/news_items_test.clj  | 2 +-
 test/cc/journeyman/the_great_game/merchants/markets_test.clj  | 2 +-
 .../the_great_game/merchants/merchant_utils_test.clj          | 2 +-
 test/cc/journeyman/the_great_game/merchants/planning_test.clj | 2 +-
 test/cc/journeyman/the_great_game/time_test.clj               | 2 +-
 test/cc/journeyman/the_great_game/utils_test.clj              | 2 +-
 test/cc/journeyman/the_great_game/world/location_test.clj     | 4 ++--
 test/cc/journeyman/the_great_game/world/routes_test.clj       | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/cc/journeyman/the_great_game/gossip/news_items.clj b/src/cc/journeyman/the_great_game/gossip/news_items.clj
index c6fe5c8..10e4883 100644
--- a/src/cc/journeyman/the_great_game/gossip/news_items.clj
+++ b/src/cc/journeyman/the_great_game/gossip/news_items.clj
@@ -229,7 +229,7 @@
            {:verb (:verb rule)}
            (map (fn [k] {k (apply (k rule) (list item))})
                 (remove
-                 #(= % :verb)
+                 #{:verb}
                  (keys rule))))))
 
 (declare learn-news-item)
diff --git a/test/cc/journeyman/the_great_game/gossip/news_items_test.clj b/test/cc/journeyman/the_great_game/gossip/news_items_test.clj
index 79137a6..ef3abfc 100644
--- a/test/cc/journeyman/the_great_game/gossip/news_items_test.clj
+++ b/test/cc/journeyman/the_great_game/gossip/news_items_test.clj
@@ -1,5 +1,5 @@
 (ns cc.journeyman.the-great-game.gossip.news-items-test
-  (:require [clojure.test :refer :all]
+  (:require [clojure.test :refer [deftest is testing]]
             [cc.journeyman.the-great-game.gossip.news-items :refer 
              [degrade-location infer interest-in-location interesting-location?
               learn-news-item make-all-inferences]]))
diff --git a/test/cc/journeyman/the_great_game/merchants/markets_test.clj b/test/cc/journeyman/the_great_game/merchants/markets_test.clj
index e86d173..d972257 100644
--- a/test/cc/journeyman/the_great_game/merchants/markets_test.clj
+++ b/test/cc/journeyman/the_great_game/merchants/markets_test.clj
@@ -1,5 +1,5 @@
 (ns cc.journeyman.the-great-game.merchants.markets-test
-  (:require [clojure.test :refer :all]
+  (:require [clojure.test :refer [deftest is testing]]
             [cc.journeyman.the-great-game.utils :refer [deep-merge]]
             [cc.journeyman.the-great-game.world.world :refer [default-world]]
             [cc.journeyman.the-great-game.merchants.markets :refer [adjust-quantity-and-price new-price run]]))
diff --git a/test/cc/journeyman/the_great_game/merchants/merchant_utils_test.clj b/test/cc/journeyman/the_great_game/merchants/merchant_utils_test.clj
index 69f40fe..52766f8 100644
--- a/test/cc/journeyman/the_great_game/merchants/merchant_utils_test.clj
+++ b/test/cc/journeyman/the_great_game/merchants/merchant_utils_test.clj
@@ -1,5 +1,5 @@
 (ns cc.journeyman.the-great-game.merchants.merchant-utils-test
-  (:require [clojure.test :refer :all]
+  (:require [clojure.test :refer [deftest is testing]]
             [cc.journeyman.the-great-game.utils :refer [deep-merge]]
             [cc.journeyman.the-great-game.world.world :refer [default-world]]
             [cc.journeyman.the-great-game.merchants.merchant-utils :refer 
diff --git a/test/cc/journeyman/the_great_game/merchants/planning_test.clj b/test/cc/journeyman/the_great_game/merchants/planning_test.clj
index ef7595b..190aaf7 100644
--- a/test/cc/journeyman/the_great_game/merchants/planning_test.clj
+++ b/test/cc/journeyman/the_great_game/merchants/planning_test.clj
@@ -1,5 +1,5 @@
 (ns cc.journeyman.the-great-game.merchants.planning-test
-  (:require [clojure.test :refer :all]
+  (:require [clojure.test :refer [deftest is testing]]
             [cc.journeyman.the-great-game.utils :refer [deep-merge]]
             [cc.journeyman.the-great-game.world.world :refer [default-world]]
             [cc.journeyman.the-great-game.merchants.planning :refer [plan-trade select-cargo]]))
diff --git a/test/cc/journeyman/the_great_game/time_test.clj b/test/cc/journeyman/the_great_game/time_test.clj
index eb5d856..cbb8689 100644
--- a/test/cc/journeyman/the_great_game/time_test.clj
+++ b/test/cc/journeyman/the_great_game/time_test.clj
@@ -1,5 +1,5 @@
 (ns cc.journeyman.the-great-game.time-test
-  (:require [clojure.test :refer :all]
+  (:require [clojure.test :refer [deftest is testing]]
 ;;            [clojure.core.async :refer [thread <!]]
             [cc.journeyman.the-great-game.time :refer 
              [date-string day days-in-season days-in-week game-day-length
diff --git a/test/cc/journeyman/the_great_game/utils_test.clj b/test/cc/journeyman/the_great_game/utils_test.clj
index 78c0654..b724c8c 100644
--- a/test/cc/journeyman/the_great_game/utils_test.clj
+++ b/test/cc/journeyman/the_great_game/utils_test.clj
@@ -1,5 +1,5 @@
 (ns cc.journeyman.the-great-game.utils-test
-  (:require [clojure.test :refer :all]
+  (:require [clojure.test :refer [deftest is testing]]
             [cc.journeyman.the-great-game.utils :refer [cyclic?]]))
 
 (deftest cyclic-tests
diff --git a/test/cc/journeyman/the_great_game/world/location_test.clj b/test/cc/journeyman/the_great_game/world/location_test.clj
index 9753e1e..6276122 100644
--- a/test/cc/journeyman/the_great_game/world/location_test.clj
+++ b/test/cc/journeyman/the_great_game/world/location_test.clj
@@ -1,6 +1,6 @@
 (ns cc.journeyman.the-great-game.world.location-test
-  (:require [clojure.test :refer :all]
-            [cc.journeyman.the-great-game.world.location :refer :all]))
+  (:require [clojure.test :refer [deftest is testing]]
+            [cc.journeyman.the-great-game.world.location :refer [distance-between get-coords]]))
 
 (deftest get-coords-test
   (testing "Get coordinates of location"
diff --git a/test/cc/journeyman/the_great_game/world/routes_test.clj b/test/cc/journeyman/the_great_game/world/routes_test.clj
index 50d8651..63cdedb 100644
--- a/test/cc/journeyman/the_great_game/world/routes_test.clj
+++ b/test/cc/journeyman/the_great_game/world/routes_test.clj
@@ -1,5 +1,5 @@
 (ns cc.journeyman.the-great-game.world.routes-test
-  (:require [clojure.test :refer :all]
+  (:require [clojure.test :refer [deftest is testing]]
             [cc.journeyman.the-great-game.world.routes :refer [find-routes]]
             [cc.journeyman.the-great-game.world.world :refer [default-world]]))