diff options
author | Determinant <ted.sybil@gmail.com> | 2020-02-25 16:16:33 -0500 |
---|---|---|
committer | Determinant <ted.sybil@gmail.com> | 2020-02-25 16:16:33 -0500 |
commit | 601fe38247a8232694a3c9af282c179e6ad1720d (patch) | |
tree | d72360651d73d67af6bc3bd51801b8fb1825d8e0 /include/hotstuff/consensus.h | |
parent | 978f39fb6e01256d388bc295e4fd8138f20ef58f (diff) |
bump salticidae version and make some minor changes
Diffstat (limited to 'include/hotstuff/consensus.h')
-rw-r--r-- | include/hotstuff/consensus.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/hotstuff/consensus.h b/include/hotstuff/consensus.h index 8a4f5f0..e2f7cfc 100644 --- a/include/hotstuff/consensus.h +++ b/include/hotstuff/consensus.h @@ -142,7 +142,7 @@ class HotStuffCore { public: /** Add a replica to the current configuration. This should only be called * before running HotStuffCore protocol. */ - void add_replica(ReplicaID rid, const NetAddr &addr, pubkey_bt &&pub_key); + void add_replica(ReplicaID rid, const PeerId &peer_id, pubkey_bt &&pub_key); /** Try to prune blocks lower than last committed height - staleness. */ void prune(uint32_t staleness); @@ -201,7 +201,7 @@ struct Proposal: public Serializable { s << "<proposal " << "rid=" << std::to_string(proposer) << " " << "blk=" << get_hex10(blk->get_hash()) << ">"; - return std::move(s); + return s; } }; @@ -261,7 +261,7 @@ struct Vote: public Serializable { s << "<vote " << "rid=" << std::to_string(voter) << " " << "blk=" << get_hex10(blk_hash) << ">"; - return std::move(s); + return s; } }; @@ -307,7 +307,7 @@ struct Finality: public Serializable { << "cmd_height=" << std::to_string(cmd_height) << " " << "cmd=" << get_hex10(cmd_hash) << " " << "blk=" << get_hex10(blk_hash) << ">"; - return std::move(s); + return s; } }; |