mirror of
https://github.com/SeedSigner/seedsigner.git
synced 2026-10-05 23:18:25 +00:00
remove parentheses from assert statements
This commit is contained in:
Submodule
+1
Submodule src/pyzbar added at c3c237821c
@@ -126,7 +126,7 @@ class Bytewords:
|
||||
elif style == Bytewords_Style_minimal:
|
||||
return encode_minimal(bytes)
|
||||
else:
|
||||
assert(False)
|
||||
assert False
|
||||
|
||||
@staticmethod
|
||||
def decode(style, str):
|
||||
@@ -137,4 +137,4 @@ class Bytewords:
|
||||
elif style == Bytewords_Style_minimal:
|
||||
return decode(str, 0, 2)
|
||||
else:
|
||||
assert(False)
|
||||
assert False
|
||||
|
||||
@@ -255,7 +255,7 @@ class FountainDecoder:
|
||||
elif self.is_failure():
|
||||
return 'Exception: {}'.format(self.result)
|
||||
else:
|
||||
assert(False)
|
||||
assert False
|
||||
|
||||
def print_part(self, p):
|
||||
print('part indexes: {}'.format(self.indexes_to_string(p.indexes)))
|
||||
|
||||
@@ -84,7 +84,7 @@ class Part:
|
||||
|
||||
class FountainEncoder:
|
||||
def __init__(self, message, max_fragment_len, first_seq_num = 0, min_fragment_len = 10):
|
||||
assert(len(message) <= MAX_UINT32)
|
||||
assert len(message) <= MAX_UINT32
|
||||
self.message_len = len(message)
|
||||
self.checksum = crc32_int(message)
|
||||
self.fragment_len = FountainEncoder.find_nominal_fragment_length(self.message_len, min_fragment_len, max_fragment_len)
|
||||
@@ -93,9 +93,9 @@ class FountainEncoder:
|
||||
|
||||
@staticmethod
|
||||
def find_nominal_fragment_length(message_len, min_fragment_len, max_fragment_len):
|
||||
assert(message_len > 0)
|
||||
assert(min_fragment_len > 0)
|
||||
assert(max_fragment_len >= min_fragment_len)
|
||||
assert message_len > 0
|
||||
assert min_fragment_len > 0
|
||||
assert max_fragment_len >= min_fragment_len
|
||||
max_fragment_count = message_len // min_fragment_len
|
||||
fragment_len = None
|
||||
|
||||
@@ -104,7 +104,7 @@ class FountainEncoder:
|
||||
if fragment_len <= max_fragment_len:
|
||||
break
|
||||
|
||||
assert(fragment_len != None)
|
||||
assert fragment_len != None
|
||||
return fragment_len
|
||||
|
||||
|
||||
|
||||
@@ -9,11 +9,11 @@ class RandomSampler:
|
||||
|
||||
def __init__(self, probs):
|
||||
for p in probs:
|
||||
assert(p > 0)
|
||||
assert p > 0
|
||||
|
||||
# Normalize given probabilities
|
||||
total = sum(probs)
|
||||
assert(total > 0)
|
||||
assert total > 0
|
||||
|
||||
n = len(probs)
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ def join_bytes(list_of_ba):
|
||||
|
||||
def xor_into(target, source):
|
||||
count = len(target)
|
||||
assert(count == len(source)) # Must be the same length
|
||||
assert count == len(source) # Must be the same length
|
||||
for i in range(count):
|
||||
target[i] ^= source[i]
|
||||
|
||||
|
||||
+14
-14
@@ -331,12 +331,12 @@ def test_parse_derivation_path():
|
||||
derivation_path = "m/84'/0'/0'/0/0"
|
||||
|
||||
result = embit_utils.parse_derivation_path(derivation_path)
|
||||
assert(result["script_type"] == SC.NATIVE_SEGWIT)
|
||||
assert(result["network"] == SC.MAINNET)
|
||||
assert result["script_type"] == SC.NATIVE_SEGWIT
|
||||
assert result["network"] == SC.MAINNET
|
||||
|
||||
result = embit_utils.parse_derivation_path(derivation_path.replace("'", "h"))
|
||||
assert(result["script_type"] == SC.NATIVE_SEGWIT)
|
||||
assert(result["network"] == SC.MAINNET)
|
||||
assert result["script_type"] == SC.NATIVE_SEGWIT
|
||||
assert result["network"] == SC.MAINNET
|
||||
|
||||
# Now exhaustively test supported permutations
|
||||
vectors_args = {
|
||||
@@ -383,20 +383,20 @@ def test_parse_derivation_path():
|
||||
actual_result = embit_utils.parse_derivation_path(derivation_path)
|
||||
|
||||
if expected_result[0] == SC.MAINNET:
|
||||
assert(actual_result["network"] == expected_result[0])
|
||||
assert(actual_result["clean_match"] is True)
|
||||
assert actual_result["network"] == expected_result[0]
|
||||
assert actual_result["clean_match"] is True
|
||||
elif expected_result[0] is None:
|
||||
assert(actual_result["network"] is None)
|
||||
assert(actual_result["clean_match"] is False)
|
||||
assert actual_result["network"] is None
|
||||
assert actual_result["clean_match"] is False
|
||||
else:
|
||||
# Testnet and regtest are returned as a list since the parser can't tell which is intended
|
||||
assert(expected_result[0] in actual_result["network"])
|
||||
assert(actual_result["clean_match"] is True)
|
||||
assert expected_result[0] in actual_result["network"]
|
||||
assert actual_result["clean_match"] is True
|
||||
|
||||
assert(actual_result["script_type"] == expected_result[1])
|
||||
assert(actual_result["is_change"] == expected_result[2])
|
||||
assert actual_result["script_type"] == expected_result[1]
|
||||
assert actual_result["is_change"] == expected_result[2]
|
||||
|
||||
if len(expected_result) == 4:
|
||||
assert(actual_result["index"] == expected_result[3])
|
||||
assert actual_result["index"] == expected_result[3]
|
||||
else:
|
||||
assert(actual_result["index"] == int(derivation_path.split("/")[-1]))
|
||||
assert actual_result["index"] == int(derivation_path.split("/")[-1])
|
||||
|
||||
+11
-11
@@ -37,17 +37,17 @@ class TestSettings(BaseTest):
|
||||
|
||||
# Now parse the settingsqr_data
|
||||
config_name, settings_update_dict = Settings.parse_settingsqr(settingsqr_data)
|
||||
assert(config_name == settings_name)
|
||||
assert config_name == settings_name
|
||||
self.settings.update(new_settings=settings_update_dict)
|
||||
|
||||
# Now verify that the settings were updated correctly
|
||||
assert(self.settings.get_value(SettingsConstants.SETTING__COMPACT_SEEDQR) == SettingsConstants.OPTION__ENABLED)
|
||||
assert(self.settings.get_value(SettingsConstants.SETTING__DIRE_WARNINGS) == SettingsConstants.OPTION__ENABLED)
|
||||
assert self.settings.get_value(SettingsConstants.SETTING__COMPACT_SEEDQR) == SettingsConstants.OPTION__ENABLED
|
||||
assert self.settings.get_value(SettingsConstants.SETTING__DIRE_WARNINGS) == SettingsConstants.OPTION__ENABLED
|
||||
|
||||
coordinators = self.settings.get_value(SettingsConstants.SETTING__COORDINATORS)
|
||||
assert(SettingsConstants.COORDINATOR__BLUE_WALLET not in coordinators)
|
||||
assert(SettingsConstants.COORDINATOR__SPARROW in coordinators)
|
||||
assert(SettingsConstants.COORDINATOR__SPECTER_DESKTOP in coordinators)
|
||||
assert SettingsConstants.COORDINATOR__BLUE_WALLET not in coordinators
|
||||
assert SettingsConstants.COORDINATOR__SPARROW in coordinators
|
||||
assert SettingsConstants.COORDINATOR__SPECTER_DESKTOP in coordinators
|
||||
|
||||
|
||||
def test_settingsqr_version(self):
|
||||
@@ -61,7 +61,7 @@ class TestSettings(BaseTest):
|
||||
settingsqr_data = "settings::v2 name=Foo"
|
||||
with pytest.raises(InvalidSettingsQRData) as e:
|
||||
Settings.parse_settingsqr(settingsqr_data)
|
||||
assert("Unsupported SettingsQR version" in str(e.value))
|
||||
assert "Unsupported SettingsQR version" in str(e.value)
|
||||
|
||||
# Should also fail if version omitted
|
||||
settingsqr_data = "settings name=Foo"
|
||||
@@ -79,8 +79,8 @@ class TestSettings(BaseTest):
|
||||
settingsqr_data = "settings::v1 name=Foo favorite_food=bacon xpub_export=D"
|
||||
config_name, settings_update_dict = Settings.parse_settingsqr(settingsqr_data)
|
||||
|
||||
assert("favorite_food" not in settings_update_dict)
|
||||
assert("xpub_export" in settings_update_dict)
|
||||
assert "favorite_food" not in settings_update_dict
|
||||
assert "xpub_export" in settings_update_dict
|
||||
|
||||
# Accepts update with no Exceptions
|
||||
self.settings.update(new_settings=settings_update_dict)
|
||||
@@ -91,7 +91,7 @@ class TestSettings(BaseTest):
|
||||
settingsqr_data = "settings::v1 name=Foo xpub_export=Yep"
|
||||
with pytest.raises(InvalidSettingsQRData) as e:
|
||||
Settings.parse_settingsqr(settingsqr_data)
|
||||
assert("xpub_export" in str(e.value))
|
||||
assert "xpub_export" in str(e.value)
|
||||
|
||||
|
||||
def test_settingsqr_parses_line_break_separators(self):
|
||||
@@ -99,7 +99,7 @@ class TestSettings(BaseTest):
|
||||
settingsqr_data = "settings::v1\nname=Foo\nsigs=ss,ms\nscripts=nat,nes,tr\nxpub_export=E\n"
|
||||
config_name, settings_update_dict = Settings.parse_settingsqr(settingsqr_data)
|
||||
|
||||
assert(len(settings_update_dict.keys()) == 3)
|
||||
assert len(settings_update_dict.keys()) == 3
|
||||
|
||||
# Accepts update with no Exceptions
|
||||
self.settings.update(new_settings=settings_update_dict)
|
||||
|
||||
@@ -14,11 +14,11 @@ class TestSettingsQRDecoder:
|
||||
# Now parse the settings_qr_str
|
||||
decoder = DecodeQR()
|
||||
status = decoder.add_data(settings_qr_str)
|
||||
assert(decoder.is_settings)
|
||||
assert(status == DecodeQRStatus.COMPLETE)
|
||||
assert decoder.is_settings
|
||||
assert status == DecodeQRStatus.COMPLETE
|
||||
|
||||
data = decoder.get_settings_data()
|
||||
assert(data == settings_qr_str)
|
||||
assert data == settings_qr_str
|
||||
|
||||
|
||||
def test_settingsqr_version(self):
|
||||
@@ -26,4 +26,4 @@ class TestSettingsQRDecoder:
|
||||
settings_qr_str = "name=Foo"
|
||||
decoder = DecodeQR()
|
||||
status = decoder.add_data(settings_qr_str)
|
||||
assert(status == DecodeQRStatus.INVALID)
|
||||
assert status == DecodeQRStatus.INVALID
|
||||
|
||||
Reference in New Issue
Block a user