AaronFiore/electrum
1
0
Fork 0
Code Activity

util: move json_normalize to util

Browse Source
This commit is contained in:
bitromortac
2020-09-24 07:14:21 +02:00
parent 52bd0eb1a6
commit 193b17f0e4
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
electrum/commands.py
View File

@@ -39,8 +39,8 @@ from decimal import Decimal
from typing import Optional, TYPE_CHECKING, Dict, List from typing import Optional, TYPE_CHECKING, Dict, List
from .import util, ecc from .import util, ecc
from .util import bfh, bh2u, format_satoshis, json_decode, json_encode, is_hash256_str, is_hex_str, to_bytes, timestamp_to_datetime from .util import (bfh, bh2u, format_satoshis, json_decode, json_normalize,
from .util import standardize_path is_hash256_str, is_hex_str, to_bytes)
from . import bitcoin from . import bitcoin
from .bitcoin import is_address, hash_160, COIN from .bitcoin import is_address, hash_160, COIN
from .bip32 import BIP32Node from .bip32 import BIP32Node
@@ -82,13 +82,6 @@ def satoshis(amount):
def format_satoshis(x): def format_satoshis(x):
return str(Decimal(x)/COIN) if x is not None else None return str(Decimal(x)/COIN) if x is not None else None
def json_normalize(x):
# note: The return value of commands, when going through the JSON-RPC interface,
# is json-encoded. The encoder used there cannot handle some types, e.g. electrum.util.Satoshis.
# note: We should not simply do "json_encode(x)" here, as then later x would get doubly json-encoded.
# see #5868
return json_decode(json_encode(x))
class Command: class Command:
def __init__(self, func, s): def __init__(self, func, s):

7
electrum/util.py
View File

@@ -379,6 +379,13 @@ def json_decode(x):
except: except:
return x return x
def json_normalize(x):
# note: The return value of commands, when going through the JSON-RPC interface,
# is json-encoded. The encoder used there cannot handle some types, e.g. electrum.util.Satoshis.
# note: We should not simply do "json_encode(x)" here, as then later x would get doubly json-encoded.
# see #5868
return json_decode(json_encode(x))
# taken from Django Source Code # taken from Django Source Code
def constant_time_compare(val1, val2): def constant_time_compare(val1, val2):