From b96736a2842a31b5368cfd5a38f2ccfae5eeea75 Mon Sep 17 00:00:00 2001 From: Fabiano Cunha Date: Wed, 15 Aug 2018 19:38:36 -0400 Subject: [PATCH] removed pivx and decred testnet, only bitg now --- electrumx/lib/coins.py | 57 --------------------------- tests/blocks/decred_testnet_1000.json | 15 ------- tests/blocks/decred_testnet_5107.json | 15 ------- tests/blocks/pivx_testnet_1000.json | 12 ------ tests/blocks/pivx_testnet_10000.json | 14 ------- tests/lib/test_addresses.py | 8 +--- tests/server/test_env.py | 8 ---- 7 files changed, 2 insertions(+), 127 deletions(-) delete mode 100644 tests/blocks/decred_testnet_1000.json delete mode 100644 tests/blocks/decred_testnet_5107.json delete mode 100644 tests/blocks/pivx_testnet_1000.json delete mode 100644 tests/blocks/pivx_testnet_10000.json diff --git a/electrumx/lib/coins.py b/electrumx/lib/coins.py index c14cee0..47470e6 100644 --- a/electrumx/lib/coins.py +++ b/electrumx/lib/coins.py @@ -1708,25 +1708,6 @@ def electrum_header(cls, header, height): return h -class DecredTestnet(Decred): - SHORTNAME = "tDCR" - NET = "testnet" - XPUB_VERBYTES = bytes.fromhex("043587d1") - XPRV_VERBYTES = bytes.fromhex("04358397") - P2PKH_VERBYTE = bytes.fromhex("0f21") - P2SH_VERBYTES = [bytes.fromhex("0efc")] - WIF_BYTE = bytes.fromhex("22de") - GENESIS_HASH = ( - '4261602a9d07d80ad47621a64ba6a07754902e496777edc4ff581946bd7bc29c') - BASIC_HEADER_SIZE = 180 - ALLOW_ADVANCING_ERRORS = True - TX_COUNT = 217380620 - TX_COUNT_HEIGHT = 464000 - TX_PER_BLOCK = 1800 - REORG_LIMIT = 1000 - RPC_PORT = 19109 - - class Axe(Dash): NAME = "Axe" SHORTNAME = "AXE" @@ -2092,44 +2073,6 @@ def header_hash(cls, header): return quark_hash.getPoWHash(header) -class PivxTestnet(Pivx): - SHORTNAME = "tPIVX" - NET = "testnet" - XPUB_VERBYTES = bytes.fromhex("3a8061a0") - XPRV_VERBYTES = bytes.fromhex("3a805837") - P2PKH_VERBYTE = bytes.fromhex("8B") - P2SH_VERBYTES = [bytes.fromhex("13")] - WIF_BYTE = bytes.fromhex("EF") - GENESIS_HASH = ( - '0000041e482b9b9691d98eefb48473405c0b8ec31b76df3797c74a78680ef818') - BASIC_HEADER_SIZE = 80 - HDR_V4_SIZE = 112 - HDR_V4_HEIGHT = 863787 - HDR_V4_START_OFFSET = HDR_V4_HEIGHT * BASIC_HEADER_SIZE - TX_COUNT = 2157510 - TX_COUNT_HEIGHT = 569399 - TX_PER_BLOCK = 2 - RPC_PORT = 51472 - - @classmethod - def static_header_offset(cls, height): - assert cls.STATIC_BLOCK_HEADERS - if height >= cls.HDR_V4_HEIGHT: - relative_v4_offset = (height - cls.HDR_V4_HEIGHT) * cls.HDR_V4_SIZE - return cls.HDR_V4_START_OFFSET + relative_v4_offset - else: - return height * cls.BASIC_HEADER_SIZE - - @classmethod - def header_hash(cls, header): - version, = util.unpack_le_uint32_from(header) - if version >= 4: - return super().header_hash(header) - else: - import quark_hash - return quark_hash.getPoWHash(header) - - class Bitg(Coin): NAME = "BitcoinGreen" diff --git a/tests/blocks/decred_testnet_1000.json b/tests/blocks/decred_testnet_1000.json deleted file mode 100644 index 3df2852..0000000 --- a/tests/blocks/decred_testnet_1000.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "hash": "00000000799ea367f425d1ae294f10f32e04af0380d9c6f02d951c5e4dc2a5a8", - "size": 3959, - "height": 1000, - "merkleroot": "1c6b7db9021ca443a368b1ab6ced700fc2f4911d86ddf6a3fb42836c715c63ee", - "stakeroot": "b87a49417bed3ef5f9d23730bf92fed96faf50ad8090190221213da10591814b", - "tx": [ - "9382c28e8994de4ee7d2fb56da80074c2fd407fdbc4c1bfa4857cfcd8746338d","53c875b9ca8bdd724750bea3d26abbfd2d5c876702a64dd1643b40580d69bbcd" - ], - "time": 1533757707, - "nonce": 3014662345, - "bits": "1d008be3", - "previousblockhash": "00000000288be7d4ba20979fe44111a93c874fc0b13671841d5a02a7489307e6", - "block": "06000000e6079348a7025a1d847136b1c04f873ca91141e49f9720bad4e78b2800000000ee635c716c8342fba3f6dd861d91f4c20f70ed6cabb168a343a41c02b97d6b1c4b819105a13d212102199080ad50af6fd9fe92bf3037d2f9f53eed7b41497ab80100ce3f1c657e0805000500810f0000e38b001d3fc6610100000000e8030000770f00000b496b5bc918b0b3c84d02003b800000000000000000000000000000000000000000000000000000000000000201000000010000000000000000000000000000000000000000000000000000000000000000ffffffff00ffffffff0380b2e60e00000000000017a914d585cd7426d25b4ea5faf1e6987aacfeda3db94287000000000000000000000e6a0ce80300006aca6aec0a1813b204146b590000000000001976a9149bb0ab1ab455c220c575304aa6bb31dad3eff19888ac00000000000000000180e14e680000000000000000ffffffff0800002f646372642f010000000102ebca3cf57241e3b837f65d196c89e913872db777ae7eb550073a07094c2f690200000001ffffffff066f3b62010000000000001976a9146a2271c09325fe31f0654612cf010a77766747c088ac6f3b62010000000000001976a9146a2271c09325fe31f0654612cf010a77766747c088ac6f3b62010000000000001976a9146a2271c09325fe31f0654612cf010a77766747c088ac6f3b62010000000000001976a9146a2271c09325fe31f0654612cf010a77766747c088ac6f3b62010000000000001976a9146a2271c09325fe31f0654612cf010a77766747c088ac80d366030000000000001976a9140224d2484ec3d15fb78403f0e2b2d718aaa6e12688ac000000000000000001bf97520a00000000d8030000040000006a4730440220476edc7c5202f3d27fd65ab67bc46541db29794567d2b5063a835ac15921e95002203a5721960dc119d7f9fd256548fcecfea7cf2ad7929a214c7b7f121edfd9d198012102c06544e9c9f6e69cd8bc15a64b32aadd37fee29b60fb7b7bd13cdfa79a0f9d140a01000000020000000000000000000000000000000000000000000000000000000000000000ffffffff00ffffffff6acaf28f760b5d64dee46cc5d24bccf497dc60b76fa556b5f64ca0ec79d0f35c0000000001ffffffff0300000000000000000000266a24e6079348a7025a1d847136b1c04f873ca91141e49f9720bad4e78b2800000000e703000000000000000000000000086a0601000600000080fe210a0000000000001abb76a91402fb6b8695886a4171290a63668bb2cb4dcf60cb88ac00000000000000000280d1f0080000000000000000ffffffff020000002d31010000000045000000100000006b483045022100ed921cd6652533166041facac63cf43959a6d58adda68fd99e68c9488dfdbaf5022043049f13ef89b73e5e6fa5890166e149eb6b3688897f6de1fc0d19108ff35d63012103bdfabc2778b0846fd03b7ff27cbca69454bae56852bf04150120fc949faeb2c001000000020000000000000000000000000000000000000000000000000000000000000000ffffffff00ffffffff04414942b66b2d577dcd572d262e844540fd850e82e4166ef74396415c6e766a0000000001ffffffff0300000000000000000000266a24e6079348a7025a1d847136b1c04f873ca91141e49f9720bad4e78b2800000000e703000000000000000000000000086a0601000600000080fe210a0000000000001abb76a914186d63d92705e3dd9f6fbc8dd79812bba1ad20eb88ac00000000000000000280d1f0080000000000000000ffffffff020000002d3101000000004c000000000000006b483045022100adc38b95618264916189c96d07966b0469156bbc0ec77982dd9f3252c269a6a80220755c8a8a6bde2db55bbbb5b2a2694de7d591399bc5f62b81c9003c2266e2eb450121038e4a96e7a3f16c5980e792bdbb4bda5ae2a007f64a6474efa303dda4d9f5680701000000020000000000000000000000000000000000000000000000000000000000000000ffffffff00ffffffff1fab36a26518675d32fbd806e260179bfc6d284b6dc8829589eb1170ca9b7bda0000000001ffffffff0300000000000000000000266a24e6079348a7025a1d847136b1c04f873ca91141e49f9720bad4e78b2800000000e703000000000000000000000000086a0601000600000080fe210a0000000000001abb76a9145d53b7695ab3ba3490e4293e08868afba0ac292488ac00000000000000000280d1f0080000000000000000ffffffff020000002d310100000000fb0100000a0000006b483045022100a9b349f4e6f07adb6ace6b939dd1ac8945b031dc57950b4ad53f85b38f6fce80022057d32783de8500dd4f471671d27be8aa3bcd370c61bdb71aa54aaac34644eb35012103b8ea4f8ef1edec541576e8b9217cb383cd081396cefd3834ffa70c253afb788e01000000020000000000000000000000000000000000000000000000000000000000000000ffffffff00ffffffff0342c19cf021246605d85929745f2968243d6154327b0526f3b63cfbe2648c130000000001ffffffff0300000000000000000000266a24e6079348a7025a1d847136b1c04f873ca91141e49f9720bad4e78b2800000000e703000000000000000000000000086a0601000600000080fe210a0000000000001abb76a914c9b62de37af563c9a4aa28150657405cc536726488ac00000000000000000280d1f0080000000000000000ffffffff020000002d31010000000017020000040000006b48304502210084303a2803a46048e892c433d171726ce82246609e7a2cd66bf88240f2c7835c0220396291766e3910349f9eff6267f4694094ef0ab74e2e690beee44f88e000a465012102fced2d2af5fd4c7e8196bda6388373f99653e36d7fb2c18837c6d48f58851cbe01000000020000000000000000000000000000000000000000000000000000000000000000ffffffff00ffffffff1092ec7609752a1ac5dfcd7aaca61e4182be62c00fd8f10d94a1b37625a160120000000001ffffffff0300000000000000000000266a24e6079348a7025a1d847136b1c04f873ca91141e49f9720bad4e78b2800000000e703000000000000000000000000086a0601000600000080fe210a0000000000001abb76a9145853a71853c514b6c2e7b9a41901ffd25c795b5c88ac00000000000000000280d1f0080000000000000000ffffffff020000002d3101000000003a020000040000006a473044022005dcb5a354cef57622c4ad17b018b7759bcd5eeb6c1e61b3c77cf5d67a0ca0500220028f1958b0dd69660ff2e06cd2245f1f68b1d27cd652e1712d30ac8e2d2df91501210279087ea45c9a83cd30a53141cbea7b3fd4a2eb4cdc155e276481f768afa445b10100000001886ed0b246dece5152ef1c889d45bcd6b835c84c20aeabe56bb5d02beda6c8340100000000ffffffff033fc661010000000000001aba76a9146bdb1be142c6a28eb6b46c77e6af0cd5fea0570488ac00000000000000000000206a1e512efecb85f5f3570781b67a3a3d924c17be3ad66f3b6201000000000058000000000000000000001abd76a914000000000000000000000000000000000000000088ac00000000f0030000016f3b620100000000e7030000010000006a4730440220368fb7d259a13371c5f5238de88eb8afc42ac311aea63cc4e34a7938cf9dff8502200edfa7a9b6021fb7ef0197ed60ce1880c3f7bf47485e65747fd4b94de2963a63012103f7243620aa170ce256f17049901f2af49de80c0af18bc39c4cb4c488350dfa200100000001886ed0b246dece5152ef1c889d45bcd6b835c84c20aeabe56bb5d02beda6c8340300000000ffffffff033fc661010000000000001aba76a9146bdb1be142c6a28eb6b46c77e6af0cd5fea0570488ac00000000000000000000206a1e3f4be579ff9de300b5c5409cd28048f7f3a2f9506f3b6201000000000058000000000000000000001abd76a914000000000000000000000000000000000000000088ac00000000f0030000016f3b620100000000e7030000010000006a473044022036a66f1d19c240651e51060e93ced603f58ed3c4a2ab43a94662ae613b0ff7a3022053e6a7b45f62300936a31da0958a1e1d5cf941b8deba377c7fb1059110d963d2012103f7243620aa170ce256f17049901f2af49de80c0af18bc39c4cb4c488350dfa200100000001886ed0b246dece5152ef1c889d45bcd6b835c84c20aeabe56bb5d02beda6c8340400000000ffffffff033fc661010000000000001aba76a9146bdb1be142c6a28eb6b46c77e6af0cd5fea0570488ac00000000000000000000206a1ec43496a70299f9141f26d5332d81ccd1401034f86f3b6201000000000058000000000000000000001abd76a914000000000000000000000000000000000000000088ac00000000f0030000016f3b620100000000e7030000010000006a473044022012f17a5dae86836865892fb33981ab638920e03fe38f8e91303400ff5d75ce80022078ff57cd45ab8e7ce6f2f7f83dc62576b7e77f3d6baa872246c7768a0517c857012103f7243620aa170ce256f17049901f2af49de80c0af18bc39c4cb4c488350dfa200100000001886ed0b246dece5152ef1c889d45bcd6b835c84c20aeabe56bb5d02beda6c8340200000000ffffffff033fc661010000000000001aba76a9146bdb1be142c6a28eb6b46c77e6af0cd5fea0570488ac00000000000000000000206a1e0b0c952908b795a22bd34644d05e7497ac9e36ef6f3b6201000000000058000000000000000000001abd76a914000000000000000000000000000000000000000088ac00000000f0030000016f3b620100000000e7030000010000006b483045022100c57dc3261f9eda554a464274bab8095782490ec83cfd24411ff57414ee5ce21f02203a8050088f932cf658417abbbaba5625d17ca05672fb81bfe5031f669e4618b2012103f7243620aa170ce256f17049901f2af49de80c0af18bc39c4cb4c488350dfa200100000001886ed0b246dece5152ef1c889d45bcd6b835c84c20aeabe56bb5d02beda6c8340000000000ffffffff033fc661010000000000001aba76a9146bdb1be142c6a28eb6b46c77e6af0cd5fea0570488ac00000000000000000000206a1e23734c360274f7ba1ad504876931e818d753b6256f3b6201000000000058000000000000000000001abd76a914000000000000000000000000000000000000000088ac00000000f0030000016f3b620100000000e7030000010000006b483045022100d9ccd5e8f569772ace3f2383846fcfd1b143ae4049778e559774a59eb4ac8ad0022026034a119b7f8e28da1f7b3521f78f2c4df1e8fe600e1f9305019b5bae52f67f012103f7243620aa170ce256f17049901f2af49de80c0af18bc39c4cb4c488350dfa20" -} diff --git a/tests/blocks/decred_testnet_5107.json b/tests/blocks/decred_testnet_5107.json deleted file mode 100644 index 7e0a5c5..0000000 --- a/tests/blocks/decred_testnet_5107.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "hash": "00000000012a019d73db2399b655283d5b9d171a7ddb1450f43fcaa405f1ec36", - "size": 3268, - "height": 5107, - "merkleroot": "ac3a7606a47dd2040d6dffa4be2afcfd79c49c5f058042750c53775b28cef107", - "stakeroot": "e04860ddcf4add1492efd27028d1d1bcc46aec4a3fb7a75a321462cbf243fa07", - "tx": [ - "a5294e3f9e820434f8ef32978db0db2e2562d72cbb3946cedf3bbd0ce963c5f3" - ], - "time": 1534338831, - "nonce": 240613287, - "bits": "1c04b24f", - "previousblockhash": "00000000026d61ba3f11deeaf560c234c3ce97764b162b4bade838443f50f5e9", - "block": "06000000e9f5503f4438e8ad4b2b164b7697cec334c260f5eade113fba616d020000000007f1ce285b77530c754280055f9cc479fdfc2abea4ff6d0d04d27da406763aac07fa43f2cb6214325aa7b73f4aec6ac4bcd1d12870d2ef9214dd4acfdd6048e00100afb5637c5ba505000400d31600004fb2041c4c04353b00000000f3130000c40c00000f27745ba777570ea66d27009dc70800000000000000000000000000000000000000000000000000060000000101000000010000000000000000000000000000000000000000000000000000000000000000ffffffff00ffffffff035c889b0e00000000000017a914d585cd7426d25b4ea5faf1e6987aacfeda3db94287000000000000000000000e6a0cf3130000cade577ed433fa29e906a7570000000000001976a9149bb0ab1ab455c220c575304aa6bb31dad3eff19888ac00000000000000000185ba40660000000000000000ffffffff0800002f646372642f0901000000020000000000000000000000000000000000000000000000000000000000000000ffffffff00ffffffff194b4523b2d4c78c65ff22e5808e3ea7a28313feea6dc54b0761380a2621927d0000000001ffffffff0300000000000000000000266a24e9f5503f4438e8ad4b2b164b7697cec334c260f5eade113fba616d0200000000f213000000000000000000000000086a06010006000000d688f4300000000000001abb76a91448ab593d8c5f66e4d7d36aa6c8c632cd7497819488ac00000000000000000237b8c3080000000000000000ffffffff0200009fd0302800000000f6120000030000006a47304402200dff6d1f46b256efc8be4a3dccb72eb7e33d31ab5f57783003c7af1ceaadd5fa022060fac2bcdfc8db52d0fbc91a87c0c566841fbc356b74f24bf75a095d2e251517012103fb0adda5197c68d63455ada1c9bab08661bdbc71bc393a1133e288ebe8344e3b01000000020000000000000000000000000000000000000000000000000000000000000000ffffffff00ffffffffee0077c55f596b83ed6d1ae90305933b7330e8b265dade192e9e06ce4789cb4f0000000001ffffffff0300000000000000000000266a24e9f5503f4438e8ad4b2b164b7697cec334c260f5eade113fba616d0200000000f213000000000000000000000000086a06010006000000dd3a192a0000000000001abb76a9145ca79529414a6ac3b652126d45d7a35112af67db88ac00000000000000000237b8c3080000000000000000ffffffff020000a682552100000000c1100000060000006a4730440220711c2659df3556b78b235c4d84dce7ebbb9d06a4296d640956de295f6bcb10bb02207983b75994bca85f46286a4beb160d45477aca43ede939d22fee6186c6f9d9f3012102e70754920ff9c6e149617315f077657406e67f77eb1643a518a43fb211a2a97901000000020000000000000000000000000000000000000000000000000000000000000000ffffffff00ffffffff2ee4624b6a220fa06765dd9af5c5f35311aac705965b60c10dfff1a89918c8a10000000001ffffffff0300000000000000000000266a24e9f5503f4438e8ad4b2b164b7697cec334c260f5eade113fba616d0200000000f213000000000000000000000000086a060100060000001084fd3b0000000000001abb76a914d5b1e62efae42c7573b0bc8be05ed39b093f34cf88ac00000000000000000237b8c3080000000000000000ffffffff020000d9cb393300000000f10e0000040000006b483045022100b1587e2c21a08c89af8583a697cd707be8803e261f0f30856ee6e04b7c3b6576022033060e9b84c4d87bea6468b25b0022e375e5d412c1f0bd84aac710f570cc7fe70121020530da62dd187e88399e485491d2d3506bf7081455a9fad84892975ebd55514c01000000020000000000000000000000000000000000000000000000000000000000000000ffffffff00ffffffff00b777f61c1ee6b29540313fa271b0df7688e3f9b5e7bdded55cbcfd94d628150000000001ffffffff0300000000000000000000266a24e9f5503f4438e8ad4b2b164b7697cec334c260f5eade113fba616d0200000000f213000000000000000000000000086a06010006000000bef3ff2b0000000000001abb76a914bf817a2d4d72ece39537aebb47d9b498e45c434988ac00000000000000000237b8c3080000000000000000ffffffff020000873b3c230000000047110000080000006b483045022100e40434401c70c9251d58d7d0338455dfbc80f904ce0c3b5b09ea41d82b363e9402203623578ade679112d4363ad4a96e463e296f7424be6e304b58035a31314625ca012102196e62558b0e58f3effbbd09abb9c58a6de4397deb48ea096d257e1ad584131b01000000020000000000000000000000000000000000000000000000000000000000000000ffffffff00ffffffffb6c4151c564022cab3a8ef1c9d67d9530d33f8183aaf204a801fb0caca0451030000000001ffffffff0300000000000000000000266a24e9f5503f4438e8ad4b2b164b7697cec334c260f5eade113fba616d0200000000f213000000000000000000000000086a06010006000000bef3ff2b0000000000001abb76a91446a30c84e1be01722814b17fd7fa010d859cbfae88ac00000000000000000237b8c3080000000000000000ffffffff020000873b3c2300000000f7100000060000006b483045022100af5a502beb6bda8e5d22330f2e2fc6999cc25b68cf66b105f42245388d1eaffa02207582b31e38daf601ff1b6f46a0b8be8bf3342b780ce238365f35ba5cec3506b80121038677ae4213eef2219b0b2f5bfb04d96977dff635d49bea9d22612d2000583ad60100000001a43f8d91d87a73105f71a0950ddc08f5dfe693f99dc802ba43648137c81d26130100000000ffffffff034c04353b0000000000001aba76a914f4b367f56063fddca0b773d113671618b8a8262088ac00000000000000000000206a1e51cd9bedc1a5ec0e296bd65df7871aa8405cc1d07c79353b000000000058000000000000000000001abd76a914000000000000000000000000000000000000000088ac0000000040140000017c79353b00000000f2130000010000006a47304402206595160b03a5d482e2c09300bc94541a113163a4002602e2ffedb6e7db029b7b02202c808e220c82d5cc11d8d219304ffeeb5f3cc1a8b431fc1a8d9dc2a6e7dc24910121026e910320ac389ca2bb35e9801d9b191eaa563b241dfcbe6ab044269f037176ae0100000001a43f8d91d87a73105f71a0950ddc08f5dfe693f99dc802ba43648137c81d26130200000000ffffffff034c04353b0000000000001aba76a914f4b367f56063fddca0b773d113671618b8a8262088ac00000000000000000000206a1ee78f8f5c24930e2d007f2d91a7c3a32189010a147c79353b000000000058000000000000000000001abd76a914000000000000000000000000000000000000000088ac0000000040140000017c79353b00000000f2130000010000006b483045022100a9472e938109373e479cf6b006c5729be7771d90489f51e4c79f527a68da406302205d4cec4db5295b0c76745764ceee5f4018328bcdaed9b53e82aac225536a2cb00121026e910320ac389ca2bb35e9801d9b191eaa563b241dfcbe6ab044269f037176ae0100000001a43f8d91d87a73105f71a0950ddc08f5dfe693f99dc802ba43648137c81d26130000000000ffffffff034c04353b0000000000001aba76a914f4b367f56063fddca0b773d113671618b8a8262088ac00000000000000000000206a1efa32cb91c88fa37f613cdb211da2f90d31a903707c79353b000000000058000000000000000000001abd76a914000000000000000000000000000000000000000088ac0000000040140000017c79353b00000000f2130000010000006b483045022100b40281cf4feb21319d39316afdcf13c2ff6d581e53d272a2efd2524216667d4f02202d8b6753c48bdcc9c328606e4483d5426595d16761273d16001d26243e775a9b0121026e910320ac389ca2bb35e9801d9b191eaa563b241dfcbe6ab044269f037176ae0100000001a43f8d91d87a73105f71a0950ddc08f5dfe693f99dc802ba43648137c81d26130300000000ffffffff034c04353b0000000000001aba76a914f4b367f56063fddca0b773d113671618b8a8262088ac00000000000000000000206a1ea8745342944879401ce93349419f10a9caf2431f7c79353b000000000058000000000000000000001abd76a914000000000000000000000000000000000000000088ac0000000040140000017c79353b00000000f2130000010000006b483045022100dfb8c4c17ecfc6b173c6e392d7685fb894f71cdfff85685db9db94b35a4c181002207de2686c74859bb8f9144fe8faa9b59491d7b4b60fadaf028f7a6026645b51950121026e910320ac389ca2bb35e9801d9b191eaa563b241dfcbe6ab044269f037176ae" -} diff --git a/tests/blocks/pivx_testnet_1000.json b/tests/blocks/pivx_testnet_1000.json deleted file mode 100644 index 3d1ab17..0000000 --- a/tests/blocks/pivx_testnet_1000.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "hash": "0923838e270b6c62e8ee957541793511c8aca8db2f6edea5209d3c6fd03b3bbb", - "size": 461, - "height": 10000, - "merkleroot": "af2180392bc2a7d273f8da7c307a12e97ebc19271b7612d2b885079564fc86cc", - "tx": ["df275d713fcf5e78e7e8369d640201d46736c0d2255e31ce45bd5aa0206f861f","b68d2b93908869b5cf6ebe069aa21dd7ca3f6d5637cc098f3ec3f6f0406f6093"], - "time": 1489054870, - "nonce": 0, - "bits": "1b0101e7", - "previousblockhash": "17314f4629950d94c597f50434a7587af405e84aa5d825f35e09bbdc5cc969e0", - "block": "03000000e069c95cdcbb095ef325d8a54ae805f47a58a73404f597c5940d9529464f3117cc86fc64950785b8d212761b2719bc7ee9127a307cdaf873d2a7c22b398021af962cc158e701011b000000000201000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0502e8030101ffffffff010000000000000000000000000001000000016d2ef9508a20c024b554567a1847b565f968b0926faa17a60c915c62f124343c1a0100006a473044022026966a060563b855e2dd95644d79af3713b81f65820a12e854dc40662034e9f702200ae2bee76842c5e21fbc9f17ea7303179e7c00447380ef3bd53a171541101451012102624e3321ae66cfa542f1febe954b052cb560a8392c5ffd9a3d821cd17f47b682ffffffff03000000000000000000f082fdc361000000232102624e3321ae66cfa542f1febe954b052cb560a8392c5ffd9a3d821cd17f47b682ac00f2052a010000001976a9144e22534048a03912670ffbc0714bb06678024d7588ac00000000463044022050067ba9a6b187114651909b16d67b367e1ced79eb2f8b8750c99da55ece848d0220237d89ec7a9cbfdf823ccd24842041cccc350ca518408bb284ed7a5b3e60de47" -} \ No newline at end of file diff --git a/tests/blocks/pivx_testnet_10000.json b/tests/blocks/pivx_testnet_10000.json deleted file mode 100644 index 99418cb..0000000 --- a/tests/blocks/pivx_testnet_10000.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "hash": "e5131e1610f037fe5b2ccce9e0c521d7811a0c46392238f0fadb06e5c25187e1", - "size": 427, - "height": 10000, - "merkleroot": "1094dedef85d4be585ee2f07af0f3f8d42634413493f67a5beee5f98dbdfbe94", - "tx": [ - "705e9918f8cb302b9c498396b89f61ce111830512a2809ef2febc315797f777f","2b255a6f234cfc1f82573bcff4158f9a08915c6cc78243a5c41c41f2e45b3561" - ], - "time": 1489600717, - "nonce": 0, - "bits": "1b00aafa", - "previousblockhash": "1002a4f8555112786b9367fb77152bcf4c058ab756d2dde312f04fbbfd6de02a", - "block": "030000002ae06dfdbb4ff012e3ddd256b78a054ccf2b1577fb67936b78125155f8a4021094bedfdb985feebea5673f49134463428d3f0faf072fee85e54b5df8dede9410cd80c958faaa001b000000000201000000010000000000000000000000000000000000000000000000000000000000000000ffffffff050210270101ffffffff01000000000000000000000000000100000001db86fae450b5cf86e783430b20d1ec5831971cc357ff0cb77458623495235a0b0100000048473044022048ac464dd1a72054a1df51982782a9d2bb8ab1922b8d24b9978ddce6cdbff6e30220497bc6951638b7d5dcae9645e8e2a687c6d736ff6a096debd70804c5139ef14101ffffffff0300000000000000000020c7f1052a010000232102624e3321ae66cfa542f1febe954b052cb560a8392c5ffd9a3d821cd17f47b682ac00f2052a010000001976a914fffc52dc6b3745407753734e8d4dbafa962b869b88ac0000000046304402206506b34c75aa787836034fcf5f01a0e051cd4eedbdd5d32fda015316c2e1951d02206db8085ec577ec6e2942d70c8c2879dfa69b6b53653c0b2c42601a1a47eea70c" -} \ No newline at end of file diff --git a/tests/lib/test_addresses.py b/tests/lib/test_addresses.py index a5bd91d..cade41d 100644 --- a/tests/lib/test_addresses.py +++ b/tests/lib/test_addresses.py @@ -56,12 +56,8 @@ (coins.Bitg, "GP1vBChXjjbaKwMcoPGB4T8cZLXWCe2wLV", "38bc968f95157bb7446feb1a7d75f2791fc8cf91", "4c7332cd142b788dd89241"), (coins.Bitg, "GaXGkXrm4dK1CYfSWvKubKgMcrYN59BZGF", - "b6f335a20a887f03a1d8a5c701f967c35d9b45c4", "383b20a90a9109531ccd7e"), - (coins.Pivx,"DGSHy3fsygJTZtvnkpT1qG8QvNim5kwyqp","7be9fe7b9f894ba8481814c5eb085b788597059a","9f1c9c70216bdc67a897fc"), - (coins.Pivx,"DSHxy3zZLUxZndKtXq9rXhwAMH1Ypt8qEW","e808105b7bfcc8b102cafa7242089b22c77a3b94","31d61c3076fa0b2b7c74ef"), - (coins.PivxTestnet,"yJ8iHtUxj9U4vsXLCZTbPNbuxG6NJNCvb8","e808105b7bfcc8b102cafa7242089b22c77a3b94","31d61c3076fa0b2b7c74ef"), - (coins.PivxTestnet,"yCcNWqqMhDmsPzKchCPK1ux4HpxK7j3xpB","ab72728952c06dfc0f6cf21449dd645422731ec4","eb3a3155215538d51de7cc") - + "b6f335a20a887f03a1d8a5c701f967c35d9b45c4", "383b20a90a9109531ccd7e") + ] # pdb.set_trace() diff --git a/tests/server/test_env.py b/tests/server/test_env.py index db66811..6afd348 100644 --- a/tests/server/test_env.py +++ b/tests/server/test_env.py @@ -119,14 +119,6 @@ def test_COIN_NET(): os.environ['NET'] = 'mainnet' e = Env() os.environ.pop('NET') - os.environ['COIN'] = ' Pivx ' - os.environ['NET'] = 'mainnet' - e = Env() - assert e.coin == lib_coins.Pivx - os.environ['NET'] = 'testnet' - e = Env() - assert e.coin == lib_coins.PivxTestnet - os.environ.pop('NET') def test_CACHE_MB():