mleku/libblkmaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor to eliminate blkmk_assemble_submission_ wrapper

Browse Source
This commit is contained in:
Luke Dashjr
2016-01-26 04:41:16 +00:00
parent e3465d35aa
commit 58aa6a3573
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
blkmaker.c
View File

@@ -574,8 +574,3 @@ char *blkmk_assemble_submission2_(blktemplate_t * const tmpl, const unsigned cha
}
return blkmk_assemble_submission2_internal(tmpl, data, extranonce, extranoncesz, nonce, foreign);
}
char *blkmk_assemble_submission_(blktemplate_t * const tmpl, const unsigned char * const data, const unsigned int dataid, const blknonce_t nonce, const bool foreign)
{
return blkmk_assemble_submission2_(tmpl, data, NULL, 0, dataid, nonce, foreign);
}

10
blkmaker_jansson.c
View File

@@ -311,7 +311,7 @@ json_t *blktmpl_propose_jansson(blktemplate_t * const tmpl, const uint32_t caps,
uint8_t sdata[0x4c];
if (!blkmk_sample_data_(tmpl, sdata, dataid))
goto err;
char *blkhex = blkmk_assemble_submission_(tmpl, sdata, dataid, 0, foreign);
char *blkhex = blkmk_assemble_submission2_(tmpl, sdata, NULL, 0, dataid, 0, foreign);
if (!blkhex)
goto err;
if (!(ja = json_string(blkhex)))
@@ -328,8 +328,8 @@ err:
}
static
json_t *_blkmk_submit_jansson(blktemplate_t *tmpl, const unsigned char *data, unsigned int dataid, blknonce_t nonce, bool foreign) {
char *blkhex = blkmk_assemble_submission_(tmpl, data, dataid, nonce, foreign);
json_t *_blkmk_submit_jansson(blktemplate_t *tmpl, const unsigned char *data, const void * const extranonce, const size_t extranoncesz, unsigned int dataid, blknonce_t nonce, bool foreign) {
char *blkhex = blkmk_assemble_submission2_(tmpl, data, extranonce, extranoncesz, dataid, nonce, foreign);
if (!blkhex)
return NULL;
@@ -378,9 +378,9 @@ err:
}
json_t *blkmk_submit_jansson(blktemplate_t *tmpl, const unsigned char *data, unsigned int dataid, blknonce_t nonce) {
return _blkmk_submit_jansson(tmpl, data, dataid, nonce, false);
return _blkmk_submit_jansson(tmpl, data, NULL, 0, dataid, nonce, false);
}
json_t *blkmk_submit_foreign_jansson(blktemplate_t *tmpl, const unsigned char *data, unsigned int dataid, blknonce_t nonce) {
return _blkmk_submit_jansson(tmpl, data, dataid, nonce, true);
return _blkmk_submit_jansson(tmpl, data, NULL, 0, dataid, nonce, true);
}

1
private.h
View File

@@ -9,7 +9,6 @@
// blkmaker.c
extern bool _blkmk_dblsha256(void *hash, const void *data, size_t datasz);
extern bool blkmk_sample_data_(blktemplate_t *, uint8_t *, unsigned int dataid);
extern char *blkmk_assemble_submission_(blktemplate_t *, const unsigned char *data, unsigned int dataid, blknonce_t nonce, bool foreign);
extern char *blkmk_assemble_submission2_(blktemplate_t *, const unsigned char *data, const void *extranonce, size_t extranoncesz, unsigned int dataid, blknonce_t nonce, bool foreign);
// blktemplate.c