aboutsummaryrefslogtreecommitdiff
path: root/test/functional/test_framework/mininode.py
diff options
context:
space:
mode:
authorJimmy Song <jaejoon@gmail.com>2017-04-17 09:23:44 -0700
committerJimmy Song <jaejoon@gmail.com>2017-04-20 11:28:45 -0700
commitc39a6b9ec8ea6599639435378e0078218a4155fc (patch)
treef80fa175ff24c825a52e5485ab56fbaf51334375 /test/functional/test_framework/mininode.py
parent987a6c09562e1e1e9d6623b999ae9de268490e4b (diff)
Tests: Refactor to create witness script creation function
* Refactor blocktools.py so that witness script creation is its own function * Changed p2p-segwit to use new function
Diffstat (limited to 'test/functional/test_framework/mininode.py')
-rwxr-xr-xtest/functional/test_framework/mininode.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py
index d57d46f2ff..2383cca58e 100755
--- a/test/functional/test_framework/mininode.py
+++ b/test/functional/test_framework/mininode.py
@@ -610,7 +610,8 @@ class CBlock(CBlockHeader):
return r
# Calculate the merkle root given a vector of transaction hashes
- def get_merkle_root(self, hashes):
+ @classmethod
+ def get_merkle_root(cls, hashes):
while len(hashes) > 1:
newhashes = []
for i in range(0, len(hashes), 2):