Skip to content

Commit

Permalink
Fix compilation on MacOS-arm64 with Apple Clang
Browse files Browse the repository at this point in the history 
Signed-off-by: James Lovejoy <[email protected]>
  • Loading branch information
@metalicjames @HalosGhost
metalicjames authored and HalosGhost committed Jun 1, 2022
1 parent f6f9c5f commit 7ebf9a9
Show file tree
Hide file tree
Showing 12 changed files with 105 additions and 105 deletions.
44 changes: 22 additions & 22 deletions tests/integration/atomizer_end_to_end_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,30 +142,30 @@ TEST_F(atomizer_end_to_end_test, complete_transaction) {
ASSERT_TRUE(res.has_value());
ASSERT_FALSE(res->m_tx_error.has_value());
ASSERT_EQ(res->m_tx_status, cbdc::sentinel::tx_status::pending);
ASSERT_EQ(tx->m_outputs[0].m_value, 33);
ASSERT_EQ(m_sender->balance(), 60);
ASSERT_EQ(tx->m_outputs[0].m_value, 33UL);
ASSERT_EQ(m_sender->balance(), 60UL);
auto in = m_sender->export_send_inputs(tx.value(), addr);
ASSERT_EQ(in.size(), 1);
ASSERT_EQ(in.size(), 1UL);

std::this_thread::sleep_for(m_block_wait_interval);
reload_sender();
ASSERT_EQ(m_sender->balance(), 60);
ASSERT_EQ(m_sender->pending_tx_count(), 1);
ASSERT_EQ(m_sender->pending_input_count(), 0);
ASSERT_EQ(m_sender->balance(), 60UL);
ASSERT_EQ(m_sender->pending_tx_count(), 1UL);
ASSERT_EQ(m_sender->pending_input_count(), 0UL);
m_sender->sync();
ASSERT_EQ(m_sender->balance(), 67);
ASSERT_EQ(m_sender->pending_tx_count(), 0);
ASSERT_EQ(m_sender->balance(), 67UL);
ASSERT_EQ(m_sender->pending_tx_count(), 0UL);

ASSERT_EQ(m_receiver->pending_input_count(), 0);
ASSERT_EQ(m_receiver->pending_input_count(), 0UL);
m_receiver->import_send_input(in[0]);
reload_receiver();
ASSERT_EQ(m_receiver->balance(), 0);
ASSERT_EQ(m_sender->pending_tx_count(), 0);
ASSERT_EQ(m_receiver->pending_input_count(), 1);
ASSERT_EQ(m_receiver->balance(), 0UL);
ASSERT_EQ(m_sender->pending_tx_count(), 0UL);
ASSERT_EQ(m_receiver->pending_input_count(), 1UL);
m_receiver->sync();
ASSERT_EQ(m_receiver->balance(), 33);
ASSERT_EQ(m_sender->pending_tx_count(), 0);
ASSERT_EQ(m_receiver->pending_input_count(), 0);
ASSERT_EQ(m_receiver->balance(), 33UL);
ASSERT_EQ(m_sender->pending_tx_count(), 0UL);
ASSERT_EQ(m_receiver->pending_input_count(), 0UL);
}

TEST_F(atomizer_end_to_end_test, double_spend) {
Expand All @@ -180,17 +180,17 @@ TEST_F(atomizer_end_to_end_test, double_spend) {
ASSERT_TRUE(res.has_value());
ASSERT_FALSE(res->m_tx_error.has_value());
ASSERT_EQ(res->m_tx_status, cbdc::sentinel::tx_status::pending);
ASSERT_EQ(tx->m_outputs[0].m_value, 33);
ASSERT_EQ(m_sender->balance(), 60);
ASSERT_EQ(tx->m_outputs[0].m_value, 33UL);
ASSERT_EQ(m_sender->balance(), 60UL);

std::this_thread::sleep_for(m_block_wait_interval);
reload_sender();
ASSERT_EQ(m_sender->balance(), 60);
ASSERT_EQ(m_sender->pending_tx_count(), 1);
ASSERT_EQ(m_sender->pending_input_count(), 0);
ASSERT_EQ(m_sender->balance(), 60UL);
ASSERT_EQ(m_sender->pending_tx_count(), 1UL);
ASSERT_EQ(m_sender->pending_input_count(), 0UL);
m_sender->sync();
ASSERT_EQ(m_sender->balance(), 67);
ASSERT_EQ(m_sender->pending_tx_count(), 0);
ASSERT_EQ(m_sender->balance(), 67UL);
ASSERT_EQ(m_sender->pending_tx_count(), 0UL);

auto sc
= cbdc::sentinel::rpc::client(m_opts.m_sentinel_endpoints, m_logger);
Expand Down
60 changes: 30 additions & 30 deletions tests/integration/two_phase_end_to_end_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class two_phase_end_to_end_test : public ::testing::Test {
std::this_thread::sleep_for(m_wait_interval);
m_sender->sync();

ASSERT_EQ(m_sender->balance(), 100);
ASSERT_EQ(m_sender->balance(), 100UL);

reload_sender();
}
Expand Down Expand Up @@ -125,21 +125,21 @@ TEST_F(two_phase_end_to_end_test, complete_transaction) {
ASSERT_TRUE(res.has_value());
ASSERT_FALSE(res->m_tx_error.has_value());
ASSERT_EQ(res->m_tx_status, cbdc::sentinel::tx_status::confirmed);
ASSERT_EQ(tx->m_outputs[0].m_value, 33);
ASSERT_EQ(m_sender->balance(), 67);
ASSERT_EQ(tx->m_outputs[0].m_value, 33UL);
ASSERT_EQ(m_sender->balance(), 67UL);
auto in = m_sender->export_send_inputs(tx.value(), addr);
ASSERT_EQ(in.size(), 1);
ASSERT_EQ(in.size(), 1UL);

ASSERT_EQ(m_receiver->pending_input_count(), 0);
ASSERT_EQ(m_receiver->pending_input_count(), 0UL);
m_receiver->import_send_input(in[0]);
reload_receiver();
ASSERT_EQ(m_receiver->balance(), 0);
ASSERT_EQ(m_sender->pending_tx_count(), 0);
ASSERT_EQ(m_receiver->pending_input_count(), 1);
ASSERT_EQ(m_receiver->balance(), 0UL);
ASSERT_EQ(m_sender->pending_tx_count(), 0UL);
ASSERT_EQ(m_receiver->pending_input_count(), 1UL);
m_receiver->sync();
ASSERT_EQ(m_receiver->balance(), 33);
ASSERT_EQ(m_sender->pending_tx_count(), 0);
ASSERT_EQ(m_receiver->pending_input_count(), 0);
ASSERT_EQ(m_receiver->balance(), 33UL);
ASSERT_EQ(m_sender->pending_tx_count(), 0UL);
ASSERT_EQ(m_receiver->pending_input_count(), 0UL);
}

TEST_F(two_phase_end_to_end_test, duplicate_transaction) {
Expand All @@ -157,26 +157,26 @@ TEST_F(two_phase_end_to_end_test, duplicate_transaction) {
ASSERT_FALSE(res2->m_tx_error.has_value());
ASSERT_EQ(res->m_tx_status, cbdc::sentinel::tx_status::confirmed);
ASSERT_EQ(res2->m_tx_status, cbdc::sentinel::tx_status::state_invalid);
ASSERT_EQ(tx->m_outputs[0].m_value, 33);
ASSERT_EQ(m_sender->balance(), 67);
ASSERT_EQ(tx->m_outputs[0].m_value, 33UL);
ASSERT_EQ(m_sender->balance(), 67UL);
auto in = m_sender->export_send_inputs(tx.value(), addr);
ASSERT_EQ(in.size(), 1);
ASSERT_EQ(in.size(), 1UL);

// Abandon the failed transaction
auto abandoned
= m_sender->abandon_transaction(cbdc::transaction::tx_id(tx.value()));
ASSERT_TRUE(abandoned);

ASSERT_EQ(m_receiver->pending_input_count(), 0);
ASSERT_EQ(m_receiver->pending_input_count(), 0UL);
m_receiver->import_send_input(in[0]);
reload_receiver();
ASSERT_EQ(m_receiver->balance(), 0);
ASSERT_EQ(m_sender->pending_tx_count(), 0);
ASSERT_EQ(m_receiver->pending_input_count(), 1);
ASSERT_EQ(m_receiver->balance(), 0UL);
ASSERT_EQ(m_sender->pending_tx_count(), 0UL);
ASSERT_EQ(m_receiver->pending_input_count(), 1UL);
m_receiver->sync();
ASSERT_EQ(m_receiver->balance(), 33);
ASSERT_EQ(m_sender->pending_tx_count(), 0);
ASSERT_EQ(m_receiver->pending_input_count(), 0);
ASSERT_EQ(m_receiver->balance(), 33UL);
ASSERT_EQ(m_sender->pending_tx_count(), 0UL);
ASSERT_EQ(m_receiver->pending_input_count(), 0UL);
}

TEST_F(two_phase_end_to_end_test, double_spend_transaction) {
Expand All @@ -189,18 +189,18 @@ TEST_F(two_phase_end_to_end_test, double_spend_transaction) {
ASSERT_TRUE(res.has_value());
ASSERT_FALSE(res->m_tx_error.has_value());
ASSERT_EQ(res->m_tx_status, cbdc::sentinel::tx_status::confirmed);
ASSERT_EQ(tx->m_outputs[0].m_value, 33);
ASSERT_EQ(m_sender->balance(), 67);
ASSERT_EQ(tx->m_outputs[0].m_value, 33UL);
ASSERT_EQ(m_sender->balance(), 67UL);
auto in = m_sender->export_send_inputs(tx.value(), addr);
ASSERT_EQ(in.size(), 1);
ASSERT_EQ(m_receiver->pending_input_count(), 0);
ASSERT_EQ(in.size(), 1UL);
ASSERT_EQ(m_receiver->pending_input_count(), 0UL);
m_receiver->import_send_input(in[0]);
reload_receiver();
ASSERT_EQ(m_receiver->balance(), 0);
ASSERT_EQ(m_receiver->pending_input_count(), 1);
ASSERT_EQ(m_receiver->balance(), 0UL);
ASSERT_EQ(m_receiver->pending_input_count(), 1UL);
m_receiver->sync();
ASSERT_EQ(m_receiver->balance(), 33);
ASSERT_EQ(m_receiver->pending_input_count(), 0);
ASSERT_EQ(m_receiver->balance(), 33UL);
ASSERT_EQ(m_receiver->pending_input_count(), 0UL);

// Create a second transaction
auto tx2 = m_sender->create_transaction(33, addr);
Expand Down Expand Up @@ -241,7 +241,7 @@ TEST_F(two_phase_end_to_end_test, double_spend_transaction) {
ASSERT_TRUE(abandoned);

// Confirm to see if our balance is restored after abandoning
ASSERT_EQ(m_sender->balance(), 67);
ASSERT_EQ(m_sender->balance(), 67UL);
}

TEST_F(two_phase_end_to_end_test, invalid_transaction) {
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/watchtower_integration_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class watchtower_integration_test : public ::testing::Test {

static constexpr auto m_watchtower_cfg_path = "integration_tests.cfg";

static constexpr auto m_best_height{1};
static constexpr size_t m_best_height{1};

cbdc::config::options m_opts{};

Expand Down
28 changes: 14 additions & 14 deletions tests/unit/archiver_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ TEST_F(ArchiverTest, archiver_leveldb_init_failure) {
TEST_F(ArchiverTest, archiver_best_block_init) {
ASSERT_TRUE(m_archiver->init_leveldb());
ASSERT_TRUE(m_archiver->init_best_block());
ASSERT_EQ(m_archiver->best_block_height(), 0);
ASSERT_EQ(m_archiver->best_block_height(), 0UL);
}

// Test if the best block height is properly initialized to non-zero
Expand All @@ -110,7 +110,7 @@ TEST_F(ArchiverTest, archiver_best_block_init_nonzero) {

archiver0->init_leveldb();
archiver0->digest_block(m_dummy_blocks[0]);
ASSERT_EQ(archiver0->best_block_height(), 1);
ASSERT_EQ(archiver0->best_block_height(), 1UL);
}
{
auto archiver1
Expand All @@ -121,7 +121,7 @@ TEST_F(ArchiverTest, archiver_best_block_init_nonzero) {

archiver1->init_leveldb();
archiver1->init_best_block();
ASSERT_EQ(archiver1->best_block_height(), 1);
ASSERT_EQ(archiver1->best_block_height(), 1UL);
}
}

Expand Down Expand Up @@ -195,7 +195,7 @@ TEST_F(ArchiverTest, digest_block) {
m_archiver->init_leveldb();
m_archiver->init_best_block();
m_archiver->digest_block(m_dummy_blocks[0]);
ASSERT_EQ(m_archiver->best_block_height(), 1);
ASSERT_EQ(m_archiver->best_block_height(), 1UL);
}

// Test if the archiver properly defers digestion of a block that is received
Expand All @@ -204,11 +204,11 @@ TEST_F(ArchiverTest, digest_block_deferral) {
m_archiver->init_leveldb();
m_archiver->init_best_block();
m_archiver->digest_block(m_dummy_blocks[0]);
ASSERT_EQ(m_archiver->best_block_height(), 1);
ASSERT_EQ(m_archiver->best_block_height(), 1UL);
m_archiver->digest_block(m_dummy_blocks[2]);
ASSERT_EQ(m_archiver->best_block_height(), 1);
ASSERT_EQ(m_archiver->best_block_height(), 1UL);
m_archiver->digest_block(m_dummy_blocks[1]);
ASSERT_EQ(m_archiver->best_block_height(), 3);
ASSERT_EQ(m_archiver->best_block_height(), 3UL);
}

// Test the get_block function
Expand All @@ -220,8 +220,8 @@ TEST_F(ArchiverTest, get_block) {
m_archiver->digest_block(m_dummy_blocks[2]);
auto blk = m_archiver->get_block(1);
ASSERT_TRUE(blk.has_value());
ASSERT_EQ(blk.value().m_height, 1);
ASSERT_EQ(blk.value().m_transactions.size(), 20);
ASSERT_EQ(blk.value().m_height, 1UL);
ASSERT_EQ(blk.value().m_transactions.size(), 20UL);
ASSERT_EQ(blk.value().m_transactions[2].m_id,
m_dummy_blocks[0].m_transactions[2].m_id);
}
Expand All @@ -244,8 +244,8 @@ TEST_F(ArchiverTest, server_handler) {
std::optional<cbdc::atomizer::block> blk;
deser >> blk;
ASSERT_TRUE(blk.has_value());
ASSERT_EQ(blk.value().m_height, 1);
ASSERT_EQ(blk.value().m_transactions.size(), 20);
ASSERT_EQ(blk.value().m_height, 1UL);
ASSERT_EQ(blk.value().m_transactions.size(), 20UL);
ASSERT_EQ(blk.value().m_transactions[2].m_id,
m_dummy_blocks[0].m_transactions[2].m_id);
}
Expand All @@ -264,8 +264,8 @@ TEST_F(ArchiverTest, client) {
ASSERT_TRUE(client.init());
auto blk = client.get_block(1);
ASSERT_TRUE(blk.has_value());
ASSERT_EQ(blk.value().m_height, 1);
ASSERT_EQ(blk.value().m_transactions.size(), 20);
ASSERT_EQ(blk.value().m_height, 1UL);
ASSERT_EQ(blk.value().m_transactions.size(), 20UL);
ASSERT_EQ(blk.value().m_transactions[2].m_id,
m_dummy_blocks[0].m_transactions[2].m_id);
}
Expand All @@ -290,5 +290,5 @@ TEST_F(ArchiverTest, init) {
m_archiver->digest_block(m_dummy_blocks[0]);
auto blk = m_archiver->get_block(1);
ASSERT_TRUE(blk.has_value());
ASSERT_EQ(m_archiver->best_block_height(), 1);
ASSERT_EQ(m_archiver->best_block_height(), 1UL);
}
2 changes: 1 addition & 1 deletion tests/unit/atomizer_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ TEST_F(atomizer_test, err_incomplete) {
ASSERT_FALSE(err.has_value());

errs = m_atomizer->make_block().second;
ASSERT_EQ(errs.size(), 1);
ASSERT_EQ(errs.size(), 1UL);
auto want
= cbdc::watchtower::tx_error{{'A'},
cbdc::watchtower::tx_error_incomplete{}};
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/config_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ TEST_F(config_validation_test, parsing_validation) {

auto window_size = ex.get_ulong("window_size");
EXPECT_TRUE(window_size.has_value());
EXPECT_EQ(window_size.value(), 40000);
EXPECT_EQ(window_size.value(), 40000UL);

auto endpoint = ex.get_endpoint("archiver0_endpoint");
EXPECT_TRUE(endpoint.has_value());
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/network_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ TEST_F(NetworkTest, reset_net) {

m_blocking_net->close();
listener.join();
ASSERT_EQ(m_blocking_net->peer_count(), 0);
ASSERT_EQ(m_blocking_net->peer_count(), 0UL);

m_blocking_net->reset();
ASSERT_TRUE(m_blocking_net->listen(cbdc::network::localhost, listen_port));
Expand Down
Loading

0 comments on commit 7ebf9a9

Please sign in to comment.