jl777 8 years ago
parent
commit
b9efc1958f
  1. 16
      iguana/dpow/dpow_rpc.c
  2. 1
      iguana/tests/ratify

16
iguana/dpow/dpow_rpc.c

@ -485,7 +485,7 @@ uint64_t dpow_paxtotal(struct dpow_info *dp)
{ {
struct pax_transaction *pax,*tmp; uint64_t total = 0; struct pax_transaction *pax,*tmp; uint64_t total = 0;
pthread_mutex_lock(&dp->mutex); pthread_mutex_lock(&dp->mutex);
if ( dp->PAX != 0 ) /*if ( dp->PAX != 0 )
{ {
tmp = 0; tmp = 0;
pax= dp->PAX->hh.next; pax= dp->PAX->hh.next;
@ -496,6 +496,11 @@ uint64_t dpow_paxtotal(struct dpow_info *dp)
tmp = pax; tmp = pax;
pax = pax->hh.next; pax = pax->hh.next;
} }
}*/
HASH_ITER(hh,dp->PAX,pax,tmp)
{
if ( pax->marked == 0 )
total += pax->komodoshis;
} }
pthread_mutex_unlock(&dp->mutex); pthread_mutex_unlock(&dp->mutex);
return(total); return(total);
@ -540,7 +545,7 @@ cJSON *dpow_withdraws_pending(struct dpow_info *dp)
{ {
struct pax_transaction *pax,*tmp; cJSON *retjson = cJSON_CreateArray(); struct pax_transaction *pax,*tmp; cJSON *retjson = cJSON_CreateArray();
pthread_mutex_lock(&dp->mutex); pthread_mutex_lock(&dp->mutex);
if ( dp->PAX != 0 ) /*if ( dp->PAX != 0 )
{ {
tmp = 0; tmp = 0;
pax = dp->PAX->hh.next; pax = dp->PAX->hh.next;
@ -551,8 +556,13 @@ cJSON *dpow_withdraws_pending(struct dpow_info *dp)
tmp = pax; tmp = pax;
pax = pax->hh.next; pax = pax->hh.next;
} }
pthread_mutex_unlock(&dp->mutex); }*/
HASH_ITER(hh,dp->PAX,pax,tmp)
{
if ( pax->marked == 0 )
jaddi(retjson,dpow_paxjson(pax));
} }
pthread_mutex_unlock(&dp->mutex);
return(retjson); return(retjson);
} }

1
iguana/tests/ratify

@ -0,0 +1 @@
curl -s "http://komodonotary.com/notary.json" | curl "http://127.0.0.1:7776" -d @-
Loading…
Cancel
Save