diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/raft_core.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/raft_core.hpp index dcf4c534e1..af2c1e83e6 100644 --- a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/raft_core.hpp +++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/raft_core.hpp @@ -34,7 +34,7 @@ public: /** * This method will be invoked when a new log entry is committed (only if the local server is the current Leader). */ - virtual void onEntryCommitted(const Entry& entry) = 0; + virtual void onEntryCommit(const Entry& entry) = 0; /** * Assume false by default. @@ -373,7 +373,7 @@ class RaftCore : private TimerBase trace(TraceRaftNewEntryCommitted, commit_index_); // AT THIS POINT ALLOCATION IS COMPLETE - log_commit_handler_.onEntryCommitted(*persistent_state_.getLog().getEntryAtIndex(commit_index_)); + log_commit_handler_.onEntryCommit(*persistent_state_.getLog().getEntryAtIndex(commit_index_)); } } } diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/server.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/server.hpp index 23668c12dc..c13a0f5224 100644 --- a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/server.hpp +++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/server.hpp @@ -119,7 +119,7 @@ class Server : private IAllocationRequestHandler } } - virtual void onEntryCommitted(const protocol::dynamic_node_id::server::Entry& entry) + virtual void onEntryCommit(const protocol::dynamic_node_id::server::Entry& entry) { tryPublishAllocationResult(entry); } diff --git a/libuavcan/test/protocol/dynamic_node_id_server/distributed/server.cpp b/libuavcan/test/protocol/dynamic_node_id_server/distributed/server.cpp index 38563e87be..c0f3e2f820 100644 --- a/libuavcan/test/protocol/dynamic_node_id_server/distributed/server.cpp +++ b/libuavcan/test/protocol/dynamic_node_id_server/distributed/server.cpp @@ -22,14 +22,14 @@ class CommitHandler : public uavcan::dynamic_node_id_server::distributed::ILeade { const std::string id_; - virtual void onEntryCommitted(const uavcan::protocol::dynamic_node_id::server::Entry& entry) + virtual void onEntryCommit(const uavcan::protocol::dynamic_node_id::server::Entry& entry) { std::cout << "ENTRY COMMITTED [" << id_ << "]\n" << entry << std::endl; } virtual void onLeaderChange(bool local_node_is_leader) { - std::cout << "I AM LEADER: " << (local_node_is_leader ? "YES" : "NOT ANYMORE") << std::endl; + std::cout << "I AM LEADER [" << id_ << "]: " << (local_node_is_leader ? "YES" : "NOT ANYMORE") << std::endl; } public: