diff --git a/tests/test_attachment_decisions.c b/tests/test_attachment_decisions.c index 4e2c93ce3..0a9900e40 100644 --- a/tests/test_attachment_decisions.c +++ b/tests/test_attachment_decisions.c @@ -206,7 +206,7 @@ static void setup(struct fixture* f) { assert(topo_node_sqlite_channel_get_priv(f->inst->topo_sqlite_db, f->channel, channel_priv) == 0); assert(member_sync_build_join_msg(channel_x, channel_ed, f->peer, peer.public_key, 1, body, sizeof(body)) == 112); assert(sc_ed25519_sign(peer_seed, body, sizeof(body), join) == SC_OK); - assert(member_sync_sign_pubkey(channel_priv, peer.public_key, certificate) == 0); + assert(member_sync_sign_join(channel_priv, join, certificate) == 0); assert(member_sync_put(f->inst, f->channel, f->peer, peer.public_key, peer_ed, join, 1, NULL, 0, "{}", NULL, NULL, 0, 0, certificate) >= 0); assert(member_sync_verified_ed25519(f->inst, f->channel, f->peer, peer_ed) == 0); diff --git a/tests/test_attachment_requests.c b/tests/test_attachment_requests.c index b4af7d113..bb0986357 100644 --- a/tests/test_attachment_requests.c +++ b/tests/test_attachment_requests.c @@ -293,7 +293,7 @@ static void setup(struct fixture* f) { assert(topo_node_sqlite_channel_get(f->inst->topo_sqlite_db, f->channel, NULL, 0, NULL, x, ed, NULL) == 0); assert(topo_node_sqlite_channel_get_priv(f->inst->topo_sqlite_db, f->channel, private_key) == 0); assert(member_sync_build_join_msg(x, ed, f->peer, peer.public_key, 1, body, sizeof(body)) == 112); - assert(sc_ed25519_sign(seed, body, sizeof(body), join) == SC_OK && member_sync_sign_pubkey(private_key, peer.public_key, certificate) == 0); + assert(sc_ed25519_sign(seed, body, sizeof(body), join) == SC_OK && member_sync_sign_join(private_key, join, certificate) == 0); assert(member_sync_put(f->inst, f->channel, f->peer, peer.public_key, peer_ed, join, 1, NULL, 0, "{}", NULL, NULL, 0, 0, certificate) >= 0); assert(member_sync_verified_ed25519(f->inst, f->channel, f->peer, peer_ed) == 0); diff --git a/tests/test_chat_join_e2e.c b/tests/test_chat_join_e2e.c index c91909cf5..358ef4c99 100644 --- a/tests/test_chat_join_e2e.c +++ b/tests/test_chat_join_e2e.c @@ -338,7 +338,7 @@ static void member_put_self(struct UTUN_INSTANCE* inst, const char* name) { inst->my_keys.public_key, join_ts, jm, (int)sizeof(jm)); uint8_t join_sig[64]; sc_ed25519_sign(inst->my_ed25519_privkey, jm, (size_t)jl, join_sig); uint8_t root_sig[64]; - member_sync_sign_pubkey(g_sh.ch_ed_priv, inst->my_keys.public_key, root_sig); + member_sync_sign_join(g_sh.ch_ed_priv, join_sig, root_sig); char userinfo[256]; snprintf(userinfo, sizeof(userinfo), "{\"name\":\"%s\"}", name); member_sync_put(inst, g_sh.ch_id, inst->node_id, inst->my_keys.public_key, inst->my_ed25519_pubkey, join_sig, join_ts, NULL, 0, userinfo, NULL, NULL, 0, 0, root_sig); @@ -354,7 +354,7 @@ static void member_put_fixture(struct UTUN_INSTANCE* inst, int idx, const char* message, sizeof(message)); char userinfo[128]; snprintf(userinfo, sizeof(userinfo), "{\"name\":\"%s\"}", name); if (size <= 0 || sc_ed25519_sign(private_key, message, (size_t)size, join_sig) != SC_OK || - member_sync_sign_pubkey(g_sh.ch_ed_priv, g_sh.x_pub[idx], root_sig) != 0 || + member_sync_sign_join(g_sh.ch_ed_priv, join_sig, root_sig) != 0 || member_sync_put(inst, g_sh.ch_id, g_sh.nid[idx], g_sh.x_pub[idx], public_key, join_sig, ts, NULL, 0, userinfo, NULL, NULL, 0, 0, root_sig) < 0) { DEBUG_ERROR(DEBUG_CATEGORY_MEMBER_SYNC, "test: signed member fixture failed node=%016llx", (unsigned long long)g_sh.nid[idx]);