Skip to content

Commit

Permalink
Merge bitcoin#490: Disambiguate bench functions and types
Browse files Browse the repository at this point in the history
1f46d60 Disambiguate bench functions and types (Pieter Wuille)

Pull request description:

  This fixes a Travis failure.

Tree-SHA512: ff601507c0bf286e29d202f3a4419977e394416e200c86848417040c79aad683399f6be1cc90b18842f4f7f2d928ef6f7562c1372bd4d4a258705819149972b2
  • Loading branch information
sipa committed Dec 21, 2017
2 parents f54c6c5 + 1f46d60 commit 02f5001
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions src/bench_ecdh.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ typedef struct {
secp256k1_context *ctx;
secp256k1_pubkey point;
unsigned char scalar[32];
} bench_ecdh;
} bench_ecdh_data;

static void bench_ecdh_setup(void* arg) {
int i;
bench_ecdh *data = (bench_ecdh*)arg;
bench_ecdh_data *data = (bench_ecdh_data*)arg;
const unsigned char point[] = {
0x03,
0x54, 0x94, 0xc1, 0x5d, 0x32, 0x09, 0x97, 0x06,
Expand All @@ -39,15 +39,15 @@ static void bench_ecdh_setup(void* arg) {
static void bench_ecdh(void* arg) {
int i;
unsigned char res[32];
bench_ecdh *data = (bench_ecdh*)arg;
bench_ecdh_data *data = (bench_ecdh_data*)arg;

for (i = 0; i < 20000; i++) {
CHECK(secp256k1_ecdh(data->ctx, res, &data->point, data->scalar) == 1);
}
}

int main(void) {
bench_ecdh data;
bench_ecdh_data data;

run_benchmark("ecdh", bench_ecdh, bench_ecdh_setup, NULL, &data, 10, 20000);
return 0;
Expand Down
8 changes: 4 additions & 4 deletions src/bench_recover.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ typedef struct {
secp256k1_context *ctx;
unsigned char msg[32];
unsigned char sig[64];
} bench_recover;
} bench_recover_data;

void bench_recover(void* arg) {
int i;
bench_recover *data = (bench_recover*)arg;
bench_recover_data *data = (bench_recover_data*)arg;
secp256k1_pubkey pubkey;
unsigned char pubkeyc[33];

Expand All @@ -38,7 +38,7 @@ void bench_recover(void* arg) {

void bench_recover_setup(void* arg) {
int i;
bench_recover *data = (bench_recover*)arg;
bench_recover_data *data = (bench_recover_data*)arg;

for (i = 0; i < 32; i++) {
data->msg[i] = 1 + i;
Expand All @@ -49,7 +49,7 @@ void bench_recover_setup(void* arg) {
}

int main(void) {
bench_recover data;
bench_recover_data data;

data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY);

Expand Down

0 comments on commit 02f5001

Please sign in to comment.