Skip to content

Fix opaque peer_id_t in tests #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mdorier wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix opaque peer_id_t in tests #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 18 additions & 27 deletions tests/host/test_event_deepcopy_free.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,10 @@
#include "libp2p/events.h"
#include "peer_id/peer_id.h"

static peer_id_t make_dummy_peer(void)
static peer_id_t *make_dummy_peer(void)
{
peer_id_t pid = {0};
pid.size = 3;
pid.bytes = (uint8_t *)malloc(pid.size);
if (pid.bytes)
{
pid.bytes[0] = 1;
pid.bytes[1] = 2;
pid.bytes[2] = 3;
}
peer_id_t *pid = NULL;
peer_id_new_from_text("12D3KooWQ7W3zfBDSSY5YTbSsfXCMVvjJAnYXhYzu3PV6PvJkU8E", &pid);
return pid;
}

Expand Down Expand Up @@ -54,7 +47,7 @@ int main(void)
}

/* Prepare a dummy peer for events that include peer IDs */
peer_id_t pid = make_dummy_peer();
peer_id_t *pid = make_dummy_peer();

/* 1) LISTEN_ADDR_ADDED */
{
Expand Down Expand Up @@ -99,7 +92,7 @@ int main(void)
const char *addr = "/ip4/127.0.0.1/tcp/4001";
libp2p_event_t e = {0};
e.kind = LIBP2P_EVT_DIALING;
e.u.dialing.peer = &pid;
e.u.dialing.peer = pid;
e.u.dialing.addr = addr;
libp2p_event_publish(h, &e);

Expand All @@ -108,7 +101,7 @@ int main(void)
goto fail;
if (!got.u.dialing.peer || !got.u.dialing.addr)
{ libp2p_event_free(&got); goto fail; }
if (got.u.dialing.peer == &pid || got.u.dialing.addr == addr)
if (got.u.dialing.peer == pid || got.u.dialing.addr == addr)
{ libp2p_event_free(&got); goto fail; }
libp2p_event_free(&got);
if (got.u.dialing.peer || got.u.dialing.addr)
Expand All @@ -120,7 +113,7 @@ int main(void)
const char *msg = "connect failed";
libp2p_event_t e = {0};
e.kind = LIBP2P_EVT_OUTGOING_CONNECTION_ERROR;
e.u.outgoing_conn_error.peer = &pid;
e.u.outgoing_conn_error.peer = pid;
e.u.outgoing_conn_error.code = -1;
e.u.outgoing_conn_error.msg = msg;
libp2p_event_publish(h, &e);
Expand All @@ -130,7 +123,7 @@ int main(void)
goto fail;
if (!got.u.outgoing_conn_error.peer || !got.u.outgoing_conn_error.msg)
{ libp2p_event_free(&got); goto fail; }
if (got.u.outgoing_conn_error.peer == &pid || got.u.outgoing_conn_error.msg == msg)
if (got.u.outgoing_conn_error.peer == pid || got.u.outgoing_conn_error.msg == msg)
{ libp2p_event_free(&got); goto fail; }
libp2p_event_free(&got);
if (got.u.outgoing_conn_error.peer || got.u.outgoing_conn_error.msg)
Expand Down Expand Up @@ -160,7 +153,7 @@ int main(void)
const char *addr = "/ip4/203.0.113.1/tcp/4001";
libp2p_event_t e = {0};
e.kind = LIBP2P_EVT_NEW_EXTERNAL_ADDR_OF_PEER;
e.u.new_external_addr_of_peer.peer = &pid;
e.u.new_external_addr_of_peer.peer = pid;
e.u.new_external_addr_of_peer.addr = addr;
libp2p_event_publish(h, &e);

Expand All @@ -169,7 +162,7 @@ int main(void)
goto fail;
if (!got.u.new_external_addr_of_peer.peer || !got.u.new_external_addr_of_peer.addr)
{ libp2p_event_free(&got); goto fail; }
if (got.u.new_external_addr_of_peer.peer == &pid || got.u.new_external_addr_of_peer.addr == addr)
if (got.u.new_external_addr_of_peer.peer == pid || got.u.new_external_addr_of_peer.addr == addr)
{ libp2p_event_free(&got); goto fail; }
libp2p_event_free(&got);
if (got.u.new_external_addr_of_peer.peer || got.u.new_external_addr_of_peer.addr)
Expand All @@ -181,7 +174,7 @@ int main(void)
const char *addr = "/ip4/127.0.0.1/tcp/4002";
libp2p_event_t e = {0};
e.kind = LIBP2P_EVT_CONN_OPENED;
e.u.conn_opened.peer = &pid;
e.u.conn_opened.peer = pid;
e.u.conn_opened.addr = addr;
e.u.conn_opened.inbound = 0;
libp2p_event_publish(h, &e);
Expand All @@ -191,7 +184,7 @@ int main(void)
goto fail;
if (!got.u.conn_opened.peer || !got.u.conn_opened.addr)
{ libp2p_event_free(&got); goto fail; }
if (got.u.conn_opened.peer == &pid || got.u.conn_opened.addr == addr)
if (got.u.conn_opened.peer == pid || got.u.conn_opened.addr == addr)
{ libp2p_event_free(&got); goto fail; }
libp2p_event_free(&got);
if (got.u.conn_opened.peer || got.u.conn_opened.addr)
Expand All @@ -202,7 +195,7 @@ int main(void)
{
libp2p_event_t e = {0};
e.kind = LIBP2P_EVT_CONN_CLOSED;
e.u.conn_closed.peer = &pid;
e.u.conn_closed.peer = pid;
e.u.conn_closed.reason = 0;
libp2p_event_publish(h, &e);

Expand All @@ -211,7 +204,7 @@ int main(void)
goto fail;
if (!got.u.conn_closed.peer)
{ libp2p_event_free(&got); goto fail; }
if (got.u.conn_closed.peer == &pid)
if (got.u.conn_closed.peer == pid)
{ libp2p_event_free(&got); goto fail; }
libp2p_event_free(&got);
if (got.u.conn_closed.peer)
Expand Down Expand Up @@ -242,7 +235,7 @@ int main(void)
libp2p_event_t e = {0};
e.kind = LIBP2P_EVT_STREAM_OPENED;
e.u.stream_opened.protocol_id = pid_str;
e.u.stream_opened.peer = &pid;
e.u.stream_opened.peer = pid;
e.u.stream_opened.initiator = 1;
libp2p_event_publish(h, &e);

Expand All @@ -251,7 +244,7 @@ int main(void)
goto fail;
if (!got.u.stream_opened.peer || !got.u.stream_opened.protocol_id)
{ libp2p_event_free(&got); goto fail; }
if (got.u.stream_opened.peer == &pid || got.u.stream_opened.protocol_id == pid_str)
if (got.u.stream_opened.peer == pid || got.u.stream_opened.protocol_id == pid_str)
{ libp2p_event_free(&got); goto fail; }
libp2p_event_free(&got);
if (got.u.stream_opened.peer || got.u.stream_opened.protocol_id)
Expand All @@ -278,15 +271,13 @@ int main(void)
}

/* cleanup */
if (pid.bytes)
free(pid.bytes);
peer_id_free(pid);
libp2p_host_free(h);
libp2p_host_builder_free(b);
return 0;

fail:
if (pid.bytes)
free(pid.bytes);
peer_id_free(pid);
libp2p_host_free(h);
libp2p_host_builder_free(b);
return 1;
Expand Down
14 changes: 5 additions & 9 deletions tests/host/test_host_identity.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ int main(void)
return 1;
}

peer_id_t expected = {0};
peer_id_t *expected = NULL;
if (peer_id_new_from_private_key_pb(sk, sk_len, &expected) != PEER_ID_OK)
{
fprintf(stderr, "peer_id_new_from_private_key_pb failed\n");
Expand All @@ -79,25 +79,21 @@ int main(void)

peer_id_t *got = NULL;
rc = libp2p_host_get_peer_id(host, &got);
int ok = (rc == 0 && got && got->bytes && got->size > 0);
int ok = (rc == 0 && got != NULL);
print_result("host_get_peer_id", ok);
if (!ok)
failures++;

if (ok)
{
int eq = peer_id_equal(&expected, got);
int eq = peer_id_equal(expected, got);
print_result("host_peer_id_matches_expected", eq == 1);
if (eq != 1)
failures++;
}

if (got)
{
peer_id_free(got);
free(got);
}
peer_id_free(&expected);
peer_id_free(got);
peer_id_free(expected);
free(sk);
libp2p_host_free(host);
return failures ? 1 : 0;
Expand Down
3 changes: 0 additions & 3 deletions tests/host/test_identify_control_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ int main(void)
if (libp2p_identify_new(ha, &opts, &ids) != 0 || !ids)
{
peer_id_free(pidB);
free(pidB);
return 1;
}

Expand All @@ -146,7 +145,6 @@ int main(void)
{
libp2p_identify_ctrl_free(ids);
peer_id_free(pidB);
free(pidB);
libp2p_host_stop(ha);
libp2p_host_stop(hb);
libp2p_host_free(ha);
Expand Down Expand Up @@ -192,7 +190,6 @@ int main(void)
libp2p_host_free_peer_protocols(protos, n);
libp2p_identify_ctrl_free(ids);
peer_id_free(pidB);
free(pidB);
libp2p_host_stop(ha);
libp2p_host_stop(hb);
libp2p_host_free(ha);
Expand Down
2 changes: 0 additions & 2 deletions tests/host/test_identify_push_publish.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ int main(void)
if (!protocols_update_waiter_start(&proto_waiter, hb, pidA, "[TEST_PUB]"))
{
peer_id_free(pidA);
free(pidA);
return 1;
}

Expand Down Expand Up @@ -266,7 +265,6 @@ int main(void)
if (pidA)
{
peer_id_free(pidA);
free(pidA);
}
fprintf(stderr, "[TEST_PUB] stopping hosts\n");
if (ping_srv)
Expand Down
3 changes: 0 additions & 3 deletions tests/host/test_identify_push_reception.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,6 @@ int main(void)
if (pidA)
{
peer_id_free(pidA);
free(pidA);
}
return 1;
}
Expand All @@ -289,7 +288,6 @@ int main(void)
if (pidA)
{
peer_id_free(pidA);
free(pidA);
}
return 1;
}
Expand Down Expand Up @@ -329,7 +327,6 @@ int main(void)
if (pidA)
{
peer_id_free(pidA);
free(pidA);
}
fprintf(stderr, "[TEST_RCV] stopping hosts\n");
libp2p_host_stop(hb);
Expand Down
17 changes: 5 additions & 12 deletions tests/host/test_quic_host_dial_upgrade.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,10 @@ static libp2p_transport_err_t stub_quic_dial(libp2p_transport_t *self, const mul
return LIBP2P_TRANSPORT_ERR_INTERNAL;
session->owner = ctx;

peer_id_t *peer = (peer_id_t *)calloc(1, sizeof(*peer));
if (!peer)
{
free(session);
return LIBP2P_TRANSPORT_ERR_INTERNAL;
}
if (peer_id_new_from_text("12D3KooWQ7W3zfBDSSY5YTbSsfXCMVvjJAnYXhYzu3PV6PvJkU8E", peer) != PEER_ID_OK)
peer_id_t *peer = NULL;
if (peer_id_new_from_text("12D3KooWQ7W3zfBDSSY5YTbSsfXCMVvjJAnYXhYzu3PV6PvJkU8E", &peer) != PEER_ID_OK)
{
peer_id_free(peer);
free(peer);
free(session);
return LIBP2P_TRANSPORT_ERR_INTERNAL;
}
Expand All @@ -113,7 +107,6 @@ static libp2p_transport_err_t stub_quic_dial(libp2p_transport_t *self, const mul
if (!conn)
{
peer_id_free(peer);
free(peer);
free(session);
return LIBP2P_TRANSPORT_ERR_INTERNAL;
}
Expand Down Expand Up @@ -383,7 +376,7 @@ int main(void)
libp2p_host_free(host);
return fail_msg("remote peer missing");
}
peer_id_t expected_peer = {0};
peer_id_t *expected_peer = NULL;
if (peer_id_new_from_text("12D3KooWQ7W3zfBDSSY5YTbSsfXCMVvjJAnYXhYzu3PV6PvJkU8E", &expected_peer) != PEER_ID_OK)
{
libp2p_stream_close(cb_state.stream);
Expand All @@ -392,8 +385,8 @@ int main(void)
libp2p_host_free(host);
return fail_msg("expected peer parse failed");
}
int same_peer = peer_id_equal(rpeer, &expected_peer);
peer_id_free(&expected_peer);
int same_peer = peer_id_equal(rpeer, expected_peer);
peer_id_free(expected_peer);
if (same_peer != 1)
{
libp2p_stream_close(cb_state.stream);
Expand Down
2 changes: 0 additions & 2 deletions tests/host/test_quic_host_stream_exchange.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,12 +314,10 @@ int main(void)
if (client_peer)
{
peer_id_free(client_peer);
free(client_peer);
}
if (server_peer)
{
peer_id_free(server_peer);
free(server_peer);
}
if (client)
libp2p_host_free(client);
Expand Down
13 changes: 2 additions & 11 deletions tests/host/test_quic_incoming_error_events.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,21 +84,13 @@ int main(void)
return 1;
}

peer_id_t *conn_peer = (peer_id_t *)calloc(1, sizeof(*conn_peer));
if (!conn_peer)
peer_id_t *conn_peer = NULL;
if (peer_id_new_from_text("12D3KooWSgVg7Ha9r8wB6L6scR8Db1wUwYUyJYEdpjXD2qH5A5X9", &conn_peer) != PEER_ID_OK)
{
free(session);
libp2p_host_free(host);
return 1;
}
if (peer_id_new_from_text("12D3KooWSgVg7Ha9r8wB6L6scR8Db1wUwYUyJYEdpjXD2qH5A5X9", conn_peer) != PEER_ID_OK)
{
peer_id_free(conn_peer);
free(conn_peer);
free(session);
libp2p_host_free(host);
return 1;
}

libp2p__host_set_quic_muxer_factory(stub_muxer_factory);

Expand All @@ -108,7 +100,6 @@ int main(void)
{
libp2p__host_set_quic_muxer_factory(NULL);
peer_id_free(conn_peer);
free(conn_peer);
free(session);
libp2p_host_free(host);
return 1;
Expand Down
Loading
Loading