diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2017-10-11 20:25:18 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2017-11-06 19:29:20 -0800 |
| commit | d618458184742b15a7ab0349127ede7a2946a182 (patch) | |
| tree | 5c08e3162c6ac3f53dd8362fe0ae1b505c5186ad /test/functional/test_framework/blockstore.py | |
| parent | 4bd89210a1484d00abba27c50ac4c07dcc05c2e0 (diff) | |
| download | bitcoin-d618458184742b15a7ab0349127ede7a2946a182.tar.xz | |
Have SegWit active by default
Diffstat (limited to 'test/functional/test_framework/blockstore.py')
| -rw-r--r-- | test/functional/test_framework/blockstore.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/test_framework/blockstore.py b/test/functional/test_framework/blockstore.py index ad04722488..051c57a6c7 100644 --- a/test/functional/test_framework/blockstore.py +++ b/test/functional/test_framework/blockstore.py @@ -100,7 +100,7 @@ class BlockStore(): def get_blocks(self, inv): responses = [] for i in inv: - if (i.type == 2): # MSG_BLOCK + if (i.type == 2 or i.type == (2 | (1 << 30))): # MSG_BLOCK or MSG_WITNESS_BLOCK data = self.get(i.hash) if data is not None: # Use msg_generic to avoid re-serialization @@ -153,7 +153,7 @@ class TxStore(): def get_transactions(self, inv): responses = [] for i in inv: - if (i.type == 1): # MSG_TX + if (i.type == 1 or i.type == (1 | (1 << 30))): # MSG_TX or MSG_WITNESS_TX tx = self.get(i.hash) if tx is not None: responses.append(msg_generic(b"tx", tx)) |