Update py2 conventions to py3, remove py2 env and assert

This commit is contained in:
mdr0id 2019-12-04 07:00:59 -08:00
parent cb81b81576
commit a7381d24ee
1 changed files with 2 additions and 3 deletions

View File

@ -1,9 +1,8 @@
#!/usr/bin/env python #!/usr/bin/env python3
# Copyright (c) 2018 The Zcash developers # Copyright (c) 2018 The Zcash developers
# Distributed under the MIT software license, see the accompanying # Distributed under the MIT software license, see the accompanying
# file COPYING or https://www.opensource.org/licenses/mit-license.php . # file COPYING or https://www.opensource.org/licenses/mit-license.php .
import sys; assert sys.version_info < (3,), ur"This script does not run under Python 3. Please use Python 2.7.x."
from test_framework.test_framework import BitcoinTestFramework from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import ( from test_framework.util import (
@ -49,7 +48,7 @@ class FinalSaplingRootTest(BitcoinTestFramework):
# Verify all generated blocks contain the empty root of the Sapling tree. # Verify all generated blocks contain the empty root of the Sapling tree.
blockcount = self.nodes[0].getblockcount() blockcount = self.nodes[0].getblockcount()
for height in xrange(1, blockcount + 1): for height in range(1, blockcount + 1):
blk = self.nodes[0].getblock(str(height)) blk = self.nodes[0].getblock(str(height))
assert_equal(blk["finalsaplingroot"], SAPLING_TREE_EMPTY_ROOT) assert_equal(blk["finalsaplingroot"], SAPLING_TREE_EMPTY_ROOT)