From 601fe38247a8232694a3c9af282c179e6ad1720d Mon Sep 17 00:00:00 2001
From: Determinant <ted.sybil@gmail.com>
Date: Tue, 25 Feb 2020 16:16:33 -0500
Subject: bump salticidae version and make some minor changes

---
 include/hotstuff/type.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'include/hotstuff/type.h')

diff --git a/include/hotstuff/type.h b/include/hotstuff/type.h
index 07c1e72..d895b73 100644
--- a/include/hotstuff/type.h
+++ b/include/hotstuff/type.h
@@ -21,6 +21,7 @@
 #include "salticidae/event.h"
 #include "salticidae/ref.h"
 #include "salticidae/netaddr.h"
+#include "salticidae/network.h"
 #include "salticidae/stream.h"
 #include "salticidae/type.h"
 #include "salticidae/util.h"
@@ -38,19 +39,16 @@ using salticidae::letoh;
 using salticidae::get_hex;
 using salticidae::from_hex;
 using salticidae::bytearray_t;
+using salticidae::get_hex10;
 using salticidae::get_hash;
 
 using salticidae::NetAddr;
+using salticidae::PeerId;
 using salticidae::TimerEvent;
 using salticidae::FdEvent;
 using salticidae::EventContext;
 using promise::promise_t;
 
-template<typename SerialType>
-inline std::string get_hex10(const SerialType &x) {
-    return get_hex(x).substr(0, 10);
-}
-
 class HotStuffError: public salticidae::SalticidaeError {
     public:
     template<typename... Args>
-- 
cgit v1.2.3