From 2311cf6ab879b352da39d89b959c735d06cbbf59 Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Mon, 13 Jun 2016 22:03:17 +0200 Subject: [PATCH 1/2] --- [SEGWIT] begin: merge --- From 279affa0c6c75330e60ea3c063bdb9114dd240bd Mon Sep 17 00:00:00 2001 From: instagibbs Date: Tue, 14 Jun 2016 11:57:44 -0400 Subject: [PATCH 2/2] Remove segnet from mininode --- qa/rpc-tests/test_framework/mininode.py | 1 - 1 file changed, 1 deletion(-) diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py index 1a94724b4e60..782a41a82dd9 100755 --- a/qa/rpc-tests/test_framework/mininode.py +++ b/qa/rpc-tests/test_framework/mininode.py @@ -1350,7 +1350,6 @@ class NodeConn(asyncore.dispatcher): "mainnet": b"\xf9\xbe\xb4\xd9", # mainnet "testnet3": b"\x0b\x11\x09\x07", # testnet3 "regtest": b"\xfa\xbf\xb5\xda", # regtest - "segnet": b"\x2e\x96\xea\xca" # segnet } def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=NODE_NETWORK):