From 819619af2ebb4b266d2265f3251a5e68d0ba741e Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 11 Oct 2016 11:49:26 -0300 Subject: [PATCH] test --- basilisk/basilisk.c | 32 ++++-------------------------- iguana/notaries.h | 2 +- iguana/tests/.addnotarys_7776.swp | Bin 0 -> 16384 bytes 3 files changed, 5 insertions(+), 29 deletions(-) create mode 100644 iguana/tests/.addnotarys_7776.swp diff --git a/basilisk/basilisk.c b/basilisk/basilisk.c index f9e3cf096..72b647212 100755 --- a/basilisk/basilisk.c +++ b/basilisk/basilisk.c @@ -903,45 +903,21 @@ int32_t basilisk_issued_purge(struct supernet_info *myinfo,int32_t timepad) return(n); } -void basilisk_iteration(struct supernet_info *myinfo) -{ - struct iguana_info *notary; uint32_t now; - now = (uint32_t)time(NULL); - notary = iguana_coinfind("NOTARY"); - if ( myinfo->NOTARY.RELAYID >= 0 ) - { - basilisk_ping_send(myinfo,notary); - /*if ( notary != 0 ) - { - struct iguana_info *virt,*tmpcoin; int32_t maxmillis; - maxmillis = (1000 / (myinfo->allcoins_numvirts + 1)) + 1; - HASH_ITER(hh,myinfo->allcoins,virt,tmpcoin) - { - if ( virt->started != 0 && virt->active != 0 && virt->virtualchain != 0 ) - gecko_iteration(myinfo,notary,virt,maxmillis), flag++; - } - }*/ - } - /*else - { - if ( myinfo->expiration != 0 && (myinfo->IAMLP != 0 || myinfo->DEXactive > now) ) - basilisk_requests_poll(myinfo); - }*/ -} - void basilisks_loop(void *arg) { static uint32_t counter; - struct supernet_info *myinfo = arg; int32_t iter; double startmilli,endmilli; + struct iguana_info *notary; struct supernet_info *myinfo = arg; int32_t iter; double startmilli,endmilli; iter = 0; + notary = iguana_coinfind("NOTARY"); while ( 1 ) { startmilli = OS_milliseconds(); basilisk_issued_purge(myinfo,600000); - basilisk_iteration(myinfo); basilisk_p2pQ_process(myinfo,777); if ( myinfo->NOTARY.RELAYID >= 0 ) { + if ( notary != 0 ) + basilisk_ping_send(myinfo,notary); if ( (counter++ % 10) == 0 ) iguana_dPoWupdate(myinfo); endmilli = startmilli + 500; diff --git a/iguana/notaries.h b/iguana/notaries.h index 8e4bf9580..487867e28 100755 --- a/iguana/notaries.h +++ b/iguana/notaries.h @@ -20,10 +20,10 @@ char *Notaries[][2] = { { "jl777_testA", "03b7621b44118017a16043f19b30cc8a4cfe068ac4e42417bae16ba460c80f3828" }, { "jl777_testB", "02ebfc784a4ba768aad88d44d1045d240d47b26e248cafaf1c5169a42d7a61d344" }, + { "jl777_testC", "020e0f6fe6e0fcdcac541eb728d6fe538a12adff20412b3c8a7fa892b223a47c2f" }, //{ "locomb_EU", "025c6d26649b9d397e63323d96db42a9d3caad82e1d6076970efe5056c00c0779b" }, //{ "movecrypto_EU", "021ab53bc6cf2c46b8a5456759f9d608966eff87384c2b52c0ac4cc8dd51e9cc42" }, //{ "pondsea_SH", "02209073bc0943451498de57f802650311b1f12aa6deffcd893da198a544c04f36" }, - //{ "jl777_testC", "020e0f6fe6e0fcdcac541eb728d6fe538a12adff20412b3c8a7fa892b223a47c2f" }, /*{ "badass_EU", "02fef1aedce576f1b9b01c60dae2dc6530fd8f13e984b324bb12002b5f3933c397" }, { "crackers_NA", "029e1c01131974f4cd3f564cc0c00eb87a0f9721043fbc1ca60f9bd0a1f73f64a1" }, { "proto_EU", "03681ffdf17c8f4f0008cefb7fa0779c5e888339cdf932f0974483787a4d6747c1" }, diff --git a/iguana/tests/.addnotarys_7776.swp b/iguana/tests/.addnotarys_7776.swp new file mode 100644 index 0000000000000000000000000000000000000000..fcc21ce3ce6b4747d6a18c772bfd8ef6fe4452b8 GIT binary patch literal 16384 zcmeI2$!ior6vm%1t}#*6lPFF)2p&vLSM{EQ=t)G35R3~9NM~kDCd}qcM-U0#^x`$= z_z!sVBAz_xKj2Mp0R_Q>cR|pvW-|#!$th2G6}~jn)#>^2tEKC`>N)q?#ml)!d4zI^ z={-4$p4&26DX+ z5CTF#2nYcoAOwVf5D)_YF@dZ(L=WJ9sP{h{?;Uq+IR5OFvEKO;8|r%>pV76YCB8|NZ#?&OxG&2=+ff)6k1iqSMgI0ptpx z<_OWd{Y00b=lh6GK`VQShM{Z^(dXSnGtkRjL@u;COf&{9?UHIfV-WWRgW ze*YiJL~*HA%}q|)-_AmoHK+19m+t?v{&5D4j*1tIil zKT#U}S{oiCKTeb%swh?glVRWWlcdwc&yY0?H0Kh{w!ukPb-Zjt&i1n%wzQTSJ(#2kbpY3c8GFo5M#u^!*6)QHUYeeYS10A-mewE`nLzZ801Fdx+T| zK{o#H@9)bpe7$ULeGf6$JwZvn^zm5`*oriUnG>Z^>oh3GL(V%;CN%gPk z-h2{BzbW;y>uh%W0;K<#%uM~jzhjBV%%riE6(Cz