Skip to content

Commit 1db2797

Browse files
committed
update chain params function naming
1 parent 3ea438a commit 1db2797

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ With contextual switch to Litecoin parameters:
1313
```python
1414
import os
1515
import litecointx
16-
from bitcointx import ChainParams, GetCurrentChainParams
16+
from bitcointx import ChainParams, get_current_chain_params
1717
from bitcointx.wallet import (
1818
CCoinKey, CCoinExtKey, P2WPKHCoinAddress, CCoinAddress
1919
)
2020

2121
with ChainParams('litecoin'):
2222
k = CCoinExtKey.from_seed(os.urandom(32))
2323
a = P2WPKHCoinAddress.from_pubkey(k.derive_path("m/0h/0h/1").pub)
24-
print('example {} address: {}'.format(GetCurrentChainParams().NAME, a))
24+
print('example {} address: {}'.format(get_current_chain_params().NAME, a))
2525
assert CCoinAddress(str(a)) == a
2626

2727
```
@@ -30,11 +30,11 @@ With global switch to Litecoin parameters:
3030

3131
```python
3232
from litecointx import LitecoinMainnetParams
33-
from bitcointx import SelectChainParams
33+
from bitcointx import select_chain_params
3434

35-
SelectChainParams('litecoin')
35+
select_chain_params('litecoin')
3636
# or, using the chain params class directly
37-
SelectChainParams(LitecoinMainnetParams)
37+
select_chain_params(LitecoinMainnetParams)
3838

3939
```
4040

@@ -52,11 +52,11 @@ assert str(canonical_adr) == 'MMDkQMv8pGGmAXdVyxaW8YtQMCHw7eouma'
5252
Without special parameter that makes CCoinAddress to decode legacy p2sh addresses:
5353

5454
```python
55-
from bitcointx import SelectChainParams
55+
from bitcointx import select_chain_params
5656
from bitcointx.wallet import CCoinAddress
5757
from litecointx.wallet import P2SHLitecoinLegacyAddress
5858

59-
SelectChainParams('litecoin', allow_legacy_p2sh=True)
59+
select_chain_params('litecoin', allow_legacy_p2sh=True)
6060
legacy_adr = CCoinAddress('3F1c6UWAs9RLN2Mbt5bAJue12VhVCorXzs')
6161
assert isinstance(legacy_adr, P2SHLitecoinLegacyAddress)
6262
```

litecointx/core/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ class CLitecoinMutableTxInWitness(CLitecoinTxInWitness,
8282
__slots__ = []
8383

8484

85-
class _CLitecoinDummyTxOutWitness(CTxOutWitnessBase):
85+
class _CLitecoinDummyTxOutWitness(CTxOutWitnessBase,
86+
metaclass=LitecoinTransactionIdentityMeta):
8687
pass
8788

8889

litecointx/wallet.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
)
2525

2626
import litecointx
27-
from bitcointx import GetCurrentChainParams
27+
from bitcointx import get_current_chain_params
2828
from bitcointx.core.script import CScript
2929
from .core.script import CLitecoinScript
3030

@@ -62,7 +62,7 @@ class CBase58LitecoinAddress(CBase58CoinAddressCommon, CLitecoinAddress):
6262

6363
@classmethod
6464
def _get_base58_address_classes(cls):
65-
params = GetCurrentChainParams()
65+
params = get_current_chain_params()
6666
if not isinstance(params, litecointx.LitecoinMainnetParams) or\
6767
not params.allow_legacy_p2sh:
6868
return (P2SHLitecoinAddress, P2PKHLitecoinAddress)

0 commit comments

Comments
 (0)