mirror of
https://github.com/GOSTSec/sgminer
synced 2025-02-02 18:14:20 +00:00
Decode work in separate functions for getwork vs gbt.
This commit is contained in:
parent
26e0115030
commit
56b16953a9
27
cgminer.c
27
cgminer.c
@ -1357,19 +1357,11 @@ static void calc_midstate(struct work *work)
|
||||
#endif
|
||||
}
|
||||
|
||||
static bool work_decode(struct pool *pool, struct work *work, json_t *val)
|
||||
static bool getwork_decode(json_t *res_val, struct work *work)
|
||||
{
|
||||
json_t *res_val = json_object_get(val, "result");
|
||||
bool ret = false;
|
||||
|
||||
if (pool->has_gbt) {
|
||||
work->gbt = true;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (unlikely(!jobj_binary(res_val, "data", work->data, sizeof(work->data), true))) {
|
||||
applog(LOG_ERR, "JSON inval data");
|
||||
goto out;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!jobj_binary(res_val, "midstate", work->midstate, sizeof(work->midstate), false)) {
|
||||
@ -1385,9 +1377,24 @@ static bool work_decode(struct pool *pool, struct work *work, json_t *val)
|
||||
|
||||
if (unlikely(!jobj_binary(res_val, "target", work->target, sizeof(work->target), true))) {
|
||||
applog(LOG_ERR, "JSON inval target");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool work_decode(struct pool *pool, struct work *work, json_t *val)
|
||||
{
|
||||
json_t *res_val = json_object_get(val, "result");
|
||||
bool ret = false;
|
||||
|
||||
if (pool->has_gbt) {
|
||||
work->gbt = true;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (unlikely(!getwork_decode(res_val, work)))
|
||||
goto out;
|
||||
|
||||
memset(work->hash, 0, sizeof(work->hash));
|
||||
|
||||
gettimeofday(&work->tv_staged, NULL);
|
||||
|
Loading…
x
Reference in New Issue
Block a user