make all events maps

src/fluree/server/broadcast.clj

@@ -29,8 +29,8 @@
     ::new-commit))
 
 (defn broadcast-error!
-  [_broadcaster watcher event-msg error]
-  (let [{:keys [tx-id]} event-msg]
+  [_broadcaster watcher event error]
+  (let [{:keys [tx-id]} event]
     (log/debug error "Delivering tx-exception to watcher")
     (watcher/deliver-error watcher tx-id error)
     ::error))

src/fluree/server/consensus/events.clj

@@ -4,37 +4,35 @@
 
 (defn event-type
   [event]
-  (nth event 0))
-
-(defn event-data
-  [event]
-  (nth event 1))
+  (:type event))
 
 (defn create-ledger
   "Upon receiving a request to create a new ledger, an event
   message must be queued into the consensus state machine.
 
   Format is [event-name event-body]"
   [ledger-id tx-id txn opts]
-  [:ledger-create {:txn       txn
-                   :size      (count txn)
-                   :tx-id     tx-id
-                   :ledger-id ledger-id
-                   :opts      opts
-                   :instant   (System/currentTimeMillis)}])
+  {:type      :ledger-create
+   :txn       txn
+   :size      (count txn)
+   :tx-id     tx-id
+   :ledger-id ledger-id
+   :opts      opts
+   :instant   (System/currentTimeMillis)})
 
 (defn commit-transaction
   "Upon receiving a request to create a new ledger, an event
   message must be queued into the consensus state machine.
 
   Format is [event-name event-body]"
   [ledger-id tx-id txn opts]
-  [:tx-queue {:txn       txn
-              :size      (count txn)
-              :tx-id     tx-id
-              :ledger-id ledger-id
-              :opts      opts
-              :instant   (System/currentTimeMillis)}])
+  {:type      :tx-queue
+   :txn       txn
+   :size      (count txn)
+   :tx-id     tx-id
+   :ledger-id ledger-id
+   :opts      opts
+   :instant   (System/currentTimeMillis)})
 
 (defn transaction-committed
   "Post-transaction, the message we will broadcast out and/or deliver

src/fluree/server/consensus/standalone.clj

@@ -57,12 +57,11 @@
   (go
     (try
       (let [event-type (events/event-type event)
-            event-msg  (events/event-data event)
             result     (<! (case event-type
-                             :ledger-create (create-ledger! conn broadcaster watcher event-msg)
-                             :tx-queue      (transact! conn broadcaster watcher event-msg)))]
+                             :ledger-create (create-ledger! conn broadcaster watcher event)
+                             :tx-queue      (transact! conn broadcaster watcher event)))]
         (if (exception? result)
-          (broadcast/broadcast-error! broadcaster watcher event-msg result)
+          (broadcast/broadcast-error! broadcaster watcher event result)
           result))
       (catch Exception e
         (log/error "Unexpected event message - expected two-tuple of [event-type event-data], "