Browse Source

Test

etomic
jl777 8 years ago
parent
commit
2072e3a3b2
  1. 1
      iguana/exchanges/LP_commands.c
  2. 7
      iguana/exchanges/LP_swap.c

1
iguana/exchanges/LP_commands.c

@ -499,6 +499,7 @@ char *stats_JSON(cJSON *argjson,char *remoteaddr,uint16_t port) // from rpc port
qp->pair = pairsock; qp->pair = pairsock;
qp->privkey = LP_privkey(qp->destaddr); qp->privkey = LP_privkey(qp->destaddr);
LP_requestinit(&qp->R,qp->srchash,qp->desthash,qp->srccoin,qp->satoshis,qp->destcoin,qp->destsatoshis,qp->timestamp,qp->quotetime,DEXselector); LP_requestinit(&qp->R,qp->srchash,qp->desthash,qp->srccoin,qp->satoshis,qp->destcoin,qp->destsatoshis,qp->timestamp,qp->quotetime,DEXselector);
printf("alice pairstr.(%s)\n",pairstr);
if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)LP_aliceloop,(void *)qp) == 0 ) if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)LP_aliceloop,(void *)qp) == 0 )
{ {
} }

7
iguana/exchanges/LP_swap.c

@ -441,6 +441,7 @@ int32_t LP_waitfor(int32_t pairsock,struct basilisk_swap *swap,int32_t timeout,i
int32_t LP_waitsend(char *statename,int32_t timeout,int32_t pairsock,struct basilisk_swap *swap,uint8_t *data,int32_t maxlen,int32_t (*verify)(struct basilisk_swap *swap,uint8_t *data,int32_t datalen),int32_t (*datagen)(struct basilisk_swap *swap,uint8_t *data,int32_t maxlen)) int32_t LP_waitsend(char *statename,int32_t timeout,int32_t pairsock,struct basilisk_swap *swap,uint8_t *data,int32_t maxlen,int32_t (*verify)(struct basilisk_swap *swap,uint8_t *data,int32_t datalen),int32_t (*datagen)(struct basilisk_swap *swap,uint8_t *data,int32_t maxlen))
{ {
int32_t datalen,sendlen,retval = -1; int32_t datalen,sendlen,retval = -1;
printf("wait on pairsock.%d\n",pairsock);
if ( LP_waitfor(pairsock,swap,timeout,verify) == 0 ) if ( LP_waitfor(pairsock,swap,timeout,verify) == 0 )
{ {
printf("waitsend waited\n"); printf("waitsend waited\n");
@ -525,9 +526,9 @@ void LP_bobloop(void *_utxo)
// bobrefund // bobrefund
// done // done
} }
basilisk_swap_finished(swap);
free(utxo->swap);
} else printf("swap timed out\n"); } else printf("swap timed out\n");
basilisk_swap_finished(swap);
free(utxo->swap);
utxo->swap = 0; utxo->swap = 0;
nn_close(utxo->pair); nn_close(utxo->pair);
utxo->pair = -1; utxo->pair = -1;
@ -536,7 +537,7 @@ void LP_bobloop(void *_utxo)
void LP_aliceloop(void *_qp) void LP_aliceloop(void *_qp)
{ {
uint8_t *data; int32_t maxlen; uint32_t expiration; struct basilisk_swap *swap = 0; struct LP_quoteinfo *qp = _qp; uint8_t *data; int32_t maxlen; uint32_t expiration; struct basilisk_swap *swap = 0; struct LP_quoteinfo *qp = _qp;
fprintf(stderr,"start swap iamalice\n"); fprintf(stderr,"start swap iamalice pair.%d\n",qp->pair);
maxlen = 1024*1024 + sizeof(*swap); maxlen = 1024*1024 + sizeof(*swap);
data = malloc(maxlen); data = malloc(maxlen);
expiration = (uint32_t)time(NULL) + 10; expiration = (uint32_t)time(NULL) + 10;

Loading…
Cancel
Save