Commit 81c6277e authored by willem's avatar willem
Browse files

Removed get_nnodes()

parent be7bcd03
...@@ -130,6 +130,15 @@ raft_server_t* raft_new() ...@@ -130,6 +130,15 @@ raft_server_t* raft_new()
return (void*)me; return (void*)me;
} }
void raft_set_callbacks(raft_server_t* me_,
raft_cbs_t* funcs, void* cb_ctx)
{
raft_server_private_t* me = (void*)me_;
memcpy(&me->cb, funcs, sizeof(raft_cbs_t));
me->cb_ctx = cb_ctx;
}
void raft_free(raft_server_t* me_) void raft_free(raft_server_t* me_)
{ {
raft_server_private_t* me = (void*)me_; raft_server_private_t* me = (void*)me_;
...@@ -775,13 +784,4 @@ int raft_get_commit_idx(raft_server_t* me_) ...@@ -775,13 +784,4 @@ int raft_get_commit_idx(raft_server_t* me_)
return ((raft_server_private_t*)me_)->commit_idx; return ((raft_server_private_t*)me_)->commit_idx;
} }
void raft_set_callbacks(raft_server_t* me_,
raft_cbs_t* funcs, void* cb_ctx)
{
raft_server_private_t* me = (void*)me_;
memcpy(&me->cb, funcs, sizeof(raft_cbs_t));
me->cb_ctx = cb_ctx;
}
/*--------------------------------------------------------------79-characters-*/ /*--------------------------------------------------------------79-characters-*/
...@@ -360,7 +360,7 @@ void TestRaft_server_election_timeout_sets_to_zero_when_elapsed_time_greater_tha ...@@ -360,7 +360,7 @@ void TestRaft_server_election_timeout_sets_to_zero_when_elapsed_time_greater_tha
CuAssertTrue(tc, raft_get_timeout_elapsed(r) < 1000); CuAssertTrue(tc, raft_get_timeout_elapsed(r) < 1000);
} }
void TestRaft_server_cfg_sets_nnodes(CuTest * tc) void TestRaft_server_cfg_sets_num_nodes(CuTest * tc)
{ {
void *r; void *r;
...@@ -373,7 +373,7 @@ void TestRaft_server_cfg_sets_nnodes(CuTest * tc) ...@@ -373,7 +373,7 @@ void TestRaft_server_cfg_sets_nnodes(CuTest * tc)
r = raft_new(); r = raft_new();
raft_set_configuration(r,cfg,0); raft_set_configuration(r,cfg,0);
CuAssertTrue(tc, 2 == raft_get_nnodes(r)); CuAssertTrue(tc, 2 == raft_get_num_nodes(r));
} }
void TestRaft_server_cant_get_node_we_dont_have(CuTest * tc) void TestRaft_server_cant_get_node_we_dont_have(CuTest * tc)
...@@ -1311,7 +1311,7 @@ void TestRaft_candidate_receives_majority_of_votes_becomes_leader(CuTest * tc) ...@@ -1311,7 +1311,7 @@ void TestRaft_candidate_receives_majority_of_votes_becomes_leader(CuTest * tc)
r = raft_new(); r = raft_new();
raft_set_configuration(r,cfg,0); raft_set_configuration(r,cfg,0);
CuAssertTrue(tc, 5 == raft_get_nnodes(r)); CuAssertTrue(tc, 5 == raft_get_num_nodes(r));
raft_set_callbacks(r,&funcs,sender); raft_set_callbacks(r,&funcs,sender);
/* vote for self */ /* vote for self */
...@@ -1528,7 +1528,7 @@ void TestRaft_leader_when_becomes_leader_all_nodes_have_nextidx_equal_to_lastlog ...@@ -1528,7 +1528,7 @@ void TestRaft_leader_when_becomes_leader_all_nodes_have_nextidx_equal_to_lastlog
raft_become_leader(r); raft_become_leader(r);
int i; int i;
for (i=0; i<raft_get_nnodes(r); i++) for (i=0; i<raft_get_num_nodes(r); i++)
{ {
if (i==0) continue; if (i==0) continue;
raft_node_t* p = raft_get_node(r,i); raft_node_t* p = raft_get_node(r,i);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment