ab82c4f

src/dev/grahp/error.clj modified (view file)

@@ -79,22 +79,6 @@                (assoc ~m '~x x#))         x#)))) -(defmacro get!-  "Same as '(get k m)', but throws an error when the key is not present"-  ([m k] `(get! ~m ~k "Failed get!, no such key in map!"))-  ([m k msg]-   `(let [m# ~m-          k# ~k]-      (if (contains? m# k#)-        (get m# k#)-        (raise ~msg {:form '~&form :map m# :key k#}))))-  ([m k msg data-map]-   `(let [m# ~m-          k# ~k]-      (if (contains? m# k#)-        (get m# k#)-        (raise ~msg (merge {:form '~&form :map m# :key k#} ~data-map))))))- (defmacro defn!   {:clj-kondo/lint-as 'clojure.core/defn}   [fn-name docstring args & body]

src/net/bowmap/network/message/client.clj modified (view file)

@@ -2,7 +2,7 @@   (:require    [clojure.alpha.spec :as s]    [dev.grahp.build :refer [build]]-   [dev.grahp.error :refer [defn! get!]]+   [dev.grahp.error :refer [defn!]]    [net.bowmap.network.message :as msg]    [net.bowmap.network.packet :as pk]    [net.bowmap.network.packet.types :as t]@@ -286,9 +286,9 @@    ids are not unique across connection states. Several packets are logically    the same across states, and can be sent without needing to switch on state."   [msg state]-  (let [payload-writer (get! packets (::msg/id msg))]+  (let [payload-writer (req! packets (::msg/id msg))]     (length-prefixed (-> (Unpooled/buffer)-                         (varint-> (get! message->packet-ids {::msg/id (::msg/id msg) ::state/connection-state state}))+                         (varint-> (req! message->packet-ids {::msg/id (::msg/id msg) ::state/connection-state state}))                          (payload-writer msg)))))  (s/fdef message->packet

src/net/bowmap/network/message/server.clj modified (view file)

@@ -2,7 +2,7 @@   (:require    [clojure.alpha.spec :as s]    [dev.grahp.build :refer [build]]-   [dev.grahp.error :refer [adorn defn! get! raise]]+   [dev.grahp.error :refer [adorn defn! raise]]    [net.bowmap.network.message :as msg]    [net.bowmap.network.packet :as pk]    [net.bowmap.network.packet.read :refer [->bit-mask ->byte ->double ->enum@@ -287,7 +287,7 @@   [packet state]   (let [numeric-id (->varint packet)         message-id (packet-ids {::state/connection-state state ::pk/id numeric-id})-        reader (get! packets message-id "No such message with that id!" {:state state})]+        reader (req! packets message-id)]     (adorn (reader packet) "Error while calling packet reader" {:numeric-id numeric-id :packet-id message-id :reader reader})))  (s/fdef packet->message