LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix some type annotations involving tuples

Browse source
This commit is contained in:
SomberNight 2018-10-13 05:16:36 +02:00
parent 7c4d6c6801
commit 1af225015a
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
electrum/bitcoin.py
View file

@ -24,7 +24,7 @@
# SOFTWARE. # SOFTWARE.
import hashlib import hashlib
from typing import List from typing import List, Tuple
from .util import bfh, bh2u, BitcoinException, print_error, assert_bytes, to_bytes, inv_dict from .util import bfh, bh2u, BitcoinException, print_error, assert_bytes, to_bytes, inv_dict
from . import version from . import version
@ -433,7 +433,7 @@ def serialize_privkey(secret: bytes, compressed: bool, txin_type: str,
return '{}:{}'.format(txin_type, base58_wif) return '{}:{}'.format(txin_type, base58_wif)
def deserialize_privkey(key: str) -> (str, bytes, bool): def deserialize_privkey(key: str) -> Tuple[str, bytes, bool]:
if is_minikey(key): if is_minikey(key):
return 'p2pkh', minikey_to_private_key(key), False return 'p2pkh', minikey_to_private_key(key), False

8
electrum/ecc.py
View file

@ -24,10 +24,8 @@
# SOFTWARE. # SOFTWARE.
import base64 import base64
import hmac
import hashlib import hashlib
from typing import Union from typing import Union, Tuple
import ecdsa import ecdsa
from ecdsa.ecdsa import curve_secp256k1, generator_secp256k1 from ecdsa.ecdsa import curve_secp256k1, generator_secp256k1
@ -110,7 +108,7 @@ def get_y_coord_from_x(x: int, odd: bool=True) -> int:
raise InvalidECPointException() raise InvalidECPointException()
def ser_to_point(ser: bytes) -> (int, int): def ser_to_point(ser: bytes) -> Tuple[int, int]:
if ser[0] not in (0x02, 0x03, 0x04): if ser[0] not in (0x02, 0x03, 0x04):
raise ValueError('Unexpected first byte: {}'.format(ser[0])) raise ValueError('Unexpected first byte: {}'.format(ser[0]))
if ser[0] == 0x04: if ser[0] == 0x04:
@ -227,7 +225,7 @@ class ECPubkey(object):
def get_public_key_hex(self, compressed=True): def get_public_key_hex(self, compressed=True):
return bh2u(self.get_public_key_bytes(compressed)) return bh2u(self.get_public_key_bytes(compressed))
def point(self) -> (int, int): def point(self) -> Tuple[int, int]:
return self._pubkey.point.x(), self._pubkey.point.y() return self._pubkey.point.x(), self._pubkey.point.y()
def __mul__(self, other: int): def __mul__(self, other: int):

3
electrum/gui/qt/installwizard.py
View file

@ -3,6 +3,7 @@ import os
import sys import sys
import threading import threading
import traceback import traceback
from typing import Tuple
from PyQt5.QtCore import * from PyQt5.QtCore import *
from PyQt5.QtGui import * from PyQt5.QtGui import *
@ -506,7 +507,7 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
@wizard_dialog @wizard_dialog
def choice_and_line_dialog(self, title, message1, choices, message2, def choice_and_line_dialog(self, title, message1, choices, message2,
test_text, run_next) -> (str, str): test_text, run_next) -> Tuple[str, str]:
vbox = QVBoxLayout() vbox = QVBoxLayout()
c_values = [x[0] for x in choices] c_values = [x[0] for x in choices]