DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Iterate operationstatus array

Browse Source
This commit is contained in:
jl777
2018-11-25 03:06:09 -11:00
parent dc11c1b310
commit 8fb27745f5
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/cc/dapps/zmigrate.c
View File

@@ -553,7 +553,7 @@ cJSON *z_getoperationstatus(char *refcoin,char *acname,char *opid)
sprintf(params,"'[\"%s\"]'",opid); sprintf(params,"'[\"%s\"]'",opid);
if ( (retjson= get_komodocli(refcoin,&retstr,acname,"z_getoperationstatus",params,"","","")) != 0 ) if ( (retjson= get_komodocli(refcoin,&retstr,acname,"z_getoperationstatus",params,"","","")) != 0 )
{ {
printf("got status (%s)\n",jprint(retjson,0)); //printf("got status (%s)\n",jprint(retjson,0));
return(retjson); return(retjson);
} }
else if ( retstr != 0 ) else if ( retstr != 0 )
@@ -808,7 +808,7 @@ int32_t tx_has_voutaddress(char *refcoin,char *acname,bits256 txid,char *coinadd
int32_t have_pending_opid(char *coinstr) int32_t have_pending_opid(char *coinstr)
{ {
cJSON *array,*status,*result; int32_t i,n,pending = 0; char *statusstr; cJSON *array,*status,*result; int32_t i,n,j,n,pending = 0; char *statusstr;
if ( (array= z_listoperationids(coinstr,"")) != 0 ) if ( (array= z_listoperationids(coinstr,"")) != 0 )
{ {
if ( (n= cJSON_GetArraySize(array)) > 0 ) if ( (n= cJSON_GetArraySize(array)) > 0 )
@@ -817,18 +817,26 @@ int32_t have_pending_opid(char *coinstr)
{ {
if ( (status= z_getoperationstatus(coinstr,"",jstri(array,i))) != 0 ) if ( (status= z_getoperationstatus(coinstr,"",jstri(array,i))) != 0 )
{ {
printf("status.(%s)\n",jprint(status,0)); if ( (m= cJSON_GetArraySize(status)) > 0 )
if ( (statusstr= jstr(status,"status")) != 0 )
{ {
if ( strcmp(statusstr,"executing") == 0 ) for (j=0; j<m; j++)
pending++;
/*else
{ {
if ( (result= z_getoperationresult(coinstr,jstri(array,i))) != 0 ) if ( (statusstr= jstr(jitem(status,j),"status")) != 0 )
{ {
free_json(result); if ( strcmp(statusstr,"executing") == 0 )
{
pending++;
printf("pending.%d\n",pending);
}
/*else
{
if ( (result= z_getoperationresult(coinstr,jstri(array,i))) != 0 )
{
free_json(result);
}
}*/
} }
}*/ }
} }
free_json(status); free_json(status);
} }