From 903469a82040c6b88c57f09a8232a089133df4d3 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 14 Feb 2016 05:43:36 -0300 Subject: [PATCH] remove nanomsg include --- iguana/SuperNET.h | 4 ++-- iguana/ramchain_api.c | 1 + iguana/swaps/iguana_BTCswap.c | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/iguana/SuperNET.h b/iguana/SuperNET.h index c89f2b6be..a12b396cf 100644 --- a/iguana/SuperNET.h +++ b/iguana/SuperNET.h @@ -19,7 +19,7 @@ #define SUPERNET_MAXHOPS 7 #include "../crypto777/OS_portable.h" #include "../includes/cJSON.h" -#include "../crypto777/nanosrc/nn.h" +//#include "../crypto777/nanosrc/nn.h" #define SUPERNET_GETPEERSTR "{\"agent\":\"SuperNET\",\"method\":\"getpeers\",\"plaintext\":1}" #define SUPERNET_STOPSTR "{\"agent\":\"SuperNET\",\"method\":\"stop\",\"plaintext\":1}" @@ -83,7 +83,7 @@ struct supernet_info struct supernet_address myaddr; int32_t LBsock,PUBsock,reqsock,subsock,networktimeout,maxdelay; uint16_t LBport,PUBport,reqport,subport; - struct nn_pollfd pfd[SUPERNET_MAXAGENTS]; //struct relay_info active; + //struct nn_pollfd pfd[SUPERNET_MAXAGENTS]; //struct relay_info active; struct supernet_agent agents[SUPERNET_MAXAGENTS]; queue_t acceptQ; int32_t numagents,numexchanges; struct exchange_info *tradingexchanges[SUPERNET_MAXEXCHANGES]; diff --git a/iguana/ramchain_api.c b/iguana/ramchain_api.c index 2d94cf29e..fdc7a8f9b 100755 --- a/iguana/ramchain_api.c +++ b/iguana/ramchain_api.c @@ -516,3 +516,4 @@ HASH_AND_STRING(ramchain,verifytx,txid,txbytes) #undef IGUANA_ARGS #include "../includes/iguana_apiundefs.h" + diff --git a/iguana/swaps/iguana_BTCswap.c b/iguana/swaps/iguana_BTCswap.c index 97b636c54..0e42f487f 100755 --- a/iguana/swaps/iguana_BTCswap.c +++ b/iguana/swaps/iguana_BTCswap.c @@ -424,8 +424,8 @@ struct instantdex_stateinfo *BTC_initFSM(int32_t *n) // "found" means the other party's is confirmed at user specified confidence level // BTC_cleanup state just unwinds pending swap as nothing has been committed yet - // states - s = instantdex_statecreate(s,n,"BTC_cleanup",BOB_processfunc,0,0,0); + // states instantdex_statecreate(s,n,,handlerfunc,errorhandler,, + // a given state has a couple of handlers and custom events, with timeouts and errors invoking a bypass s = instantdex_statecreate(s,n,"BTC_cleanup",BOB_processfunc,0,0,0); s = instantdex_statecreate(s,n,"BOB_claimdeposit",BOB_processfunc,0,0,0); s = instantdex_statecreate(s,n,"ALICE_reclaim",BOB_processfunc,0,0,0); @@ -453,7 +453,7 @@ struct instantdex_stateinfo *BTC_initFSM(int32_t *n) s = instantdex_statecreate(s,n,"ALICE_claimedbtc",BOB_processfunc,0,0,0); s = instantdex_statecreate(s,n,"BOB_claimedalt",BOB_processfunc,0,0,0); - // events + // events instantdex_addevent(s,*n,,,,) instantdex_addevent(s,*n,"BOB_sentoffer","BTCchose","BTCprivs","BOB_sentprivs"); instantdex_addevent(s,*n,"BOB_sentprivs","feefound","BTCdeptx","BOB_sentdeposit"); instantdex_addevent(s,*n,"ALICE_sentoffer","BTCchose","BTCprivs","ALICE_sentprivs");