Skip to content

Commit 7ad2e78

Browse files
asladeofgreenasladeofgreen
committed
1. Reducing package depth in types sub-package.
1 parent 8a757e5 commit 7ad2e78

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+323
-336
lines changed

‎how_tos/deploys/how_to_delegate.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from pycspr.types.crypto import KeyAlgorithm
1111
from pycspr.types.crypto import PrivateKey
1212
from pycspr.types.crypto import PublicKey
13-
from pycspr.types.node.rpc import Deploy
13+
from pycspr.types.node import Deploy
1414

1515

1616
# Path to CCTL assets.

‎how_tos/deploys/how_to_stake.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from pycspr import NodeRpcConnectionInfo as NodeConnectionInfo
99
from pycspr.types.crypto import KeyAlgorithm
1010
from pycspr.types.crypto import PrivateKey
11-
from pycspr.types.node.rpc import Deploy
11+
from pycspr.types.node import Deploy
1212

1313

1414
# Path to CCTL assets.

‎how_tos/deploys/how_to_transfer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from pycspr.types.crypto import KeyAlgorithm
1212
from pycspr.types.crypto import PrivateKey
1313
from pycspr.types.crypto import PublicKey
14-
from pycspr.types.node.rpc import Deploy
14+
from pycspr.types.node import Deploy
1515

1616

1717
# Path to CCTL assets.

‎how_tos/deploys/how_to_undelegate.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from pycspr.types.crypto import KeyAlgorithm
1111
from pycspr.types.crypto import PrivateKey
1212
from pycspr.types.crypto import PublicKey
13-
from pycspr.types.node.rpc import Deploy
13+
from pycspr.types.node import Deploy
1414

1515

1616
# Path to CCTL assets.

‎how_tos/deploys/how_to_unstake.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from pycspr import NodeRpcConnectionInfo as NodeConnectionInfo
99
from pycspr.types.crypto import KeyAlgorithm
1010
from pycspr.types.crypto import PrivateKey
11-
from pycspr.types.node.rpc import Deploy
11+
from pycspr.types.node import Deploy
1212
from pycspr.types.cl import CLV_URef
1313

1414

‎how_tos/node_apis/how_to_use_rest_client.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
from pycspr import NodeRestClient as NodeClient
66
from pycspr import NodeRestConnectionInfo as NodeConnectionInfo
7-
from pycspr.types.node.rpc import NodeStatus
8-
from pycspr.types.node.rpc import ValidatorChanges
7+
from pycspr.types.node import NodeStatus
8+
from pycspr.types.node import ValidatorChanges
99

1010

1111
# CLI argument parser.

‎how_tos/node_apis/how_to_use_rpc_client.py

+13-13
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
from pycspr import NodeRpcClient as NodeClient
99
from pycspr import NodeRpcConnectionInfo as NodeConnectionInfo
1010
from pycspr.types.cl import CLV_URef
11-
from pycspr.types.node.rpc import AccountInfo
12-
from pycspr.types.node.rpc import AuctionState
13-
from pycspr.types.node.rpc import Block
14-
from pycspr.types.node.rpc import BlockTransfers
15-
from pycspr.types.node.rpc import EraSummary
16-
from pycspr.types.node.rpc import GlobalStateID
17-
from pycspr.types.node.rpc import GlobalStateIDType
18-
from pycspr.types.node.rpc import NodePeer
19-
from pycspr.types.node.rpc import NodeStatus
20-
from pycspr.types.node.rpc import PurseID
21-
from pycspr.types.node.rpc import PurseIDType
22-
from pycspr.types.node.rpc import URef
23-
from pycspr.types.node.rpc import ValidatorChanges
11+
from pycspr.types.node import AccountInfo
12+
from pycspr.types.node import AuctionState
13+
from pycspr.types.node import Block
14+
from pycspr.types.node import BlockTransfers
15+
from pycspr.types.node import EraSummary
16+
from pycspr.types.node import GlobalStateID
17+
from pycspr.types.node import GlobalStateIDType
18+
from pycspr.types.node import NodePeer
19+
from pycspr.types.node import NodeStatus
20+
from pycspr.types.node import PurseID
21+
from pycspr.types.node import PurseIDType
22+
from pycspr.types.node import URef
23+
from pycspr.types.node import ValidatorChanges
2424

2525

2626
# Path to CCTL assets.

‎how_tos/node_apis/how_to_use_speculative_rpc_client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from pycspr.types.crypto import KeyAlgorithm
1313
from pycspr.types.crypto import PrivateKey
1414
from pycspr.types.crypto import PublicKey
15-
from pycspr.types.node.rpc import Deploy
15+
from pycspr.types.node import Deploy
1616

1717

1818
# Path to CCTL assets.

‎how_tos/smart_contracts/how_to_install.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
from pycspr.types.cl import CLV_String
1212
from pycspr.types.cl import CLV_U8
1313
from pycspr.types.cl import CLV_U256
14-
from pycspr.types.node.rpc import Deploy
15-
from pycspr.types.node.rpc import DeployParameters
16-
from pycspr.types.node.rpc import DeployOfModuleBytes
14+
from pycspr.types.node import Deploy
15+
from pycspr.types.node import DeployParameters
16+
from pycspr.types.node import DeployOfModuleBytes
1717

1818

1919
# Path to CCTL assets.

‎how_tos/smart_contracts/how_to_invoke.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
from pycspr.types.crypto import PublicKey
1313
from pycspr.types.cl import CLV_ByteArray
1414
from pycspr.types.cl import CLV_U256
15-
from pycspr.types.node.rpc import Deploy
16-
from pycspr.types.node.rpc import DeployParameters
17-
from pycspr.types.node.rpc import DeployOfModuleBytes
18-
from pycspr.types.node.rpc import DeployOfStoredContractByHash
15+
from pycspr.types.node import Deploy
16+
from pycspr.types.node import DeployParameters
17+
from pycspr.types.node import DeployOfModuleBytes
18+
from pycspr.types.node import DeployOfStoredContractByHash
1919

2020

2121
# Path to CCTL network assets.

‎how_tos/smart_contracts/how_to_query_dictionary.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from pycspr import NodeRpcClient as NodeClient
55
from pycspr import NodeRpcConnectionInfo as NodeConnectionInfo
6-
from pycspr.types.node.rpc import DictionaryID_ContractNamedKey
6+
from pycspr.types.node import DictionaryID_ContractNamedKey
77

88

99
# CLI argument parser.

‎pycspr/api/__init__.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from pycspr.api.rpc_speculative import ConnectionInfo as NodeSpeculativeRpcConnectionInfo
77
from pycspr.api.sse import Client as NodeSseClient
88
from pycspr.api.sse import ConnectionInfo as NodeSseConnectionInfo
9-
from pycspr.types.node.sse import NodeEventChannel
10-
from pycspr.types.node.sse import NodeEventInfo
11-
from pycspr.types.node.sse import NodeEventType
12-
from pycspr.types.node.sse import SSE_CHANNEL_TO_SSE_EVENT
9+
from pycspr.types.node import NodeEventChannel
10+
from pycspr.types.node import NodeEventInfo
11+
from pycspr.types.node import NodeEventType
12+
from pycspr.types.node import SSE_CHANNEL_TO_SSE_EVENT

‎pycspr/api/rest/client.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
from pycspr import serializer
44
from pycspr.api.rest.connection import ConnectionInfo
55
from pycspr.api.rest.proxy import Proxy
6-
from pycspr.types.node.rpc import NodeStatus
7-
from pycspr.types.node.rpc import ValidatorChanges
6+
from pycspr.types.node import NodeStatus
7+
from pycspr.types.node import ValidatorChanges
88

99

1010
class Client():

‎pycspr/api/rpc/client.py

+17-17
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66
from pycspr.api.rpc.proxy import Proxy
77
from pycspr.types.cl import CLV_Key
88
from pycspr.types.crypto import DigestBytes
9-
from pycspr.types.node.rpc import Address
10-
from pycspr.types.node.rpc import AccountInfo
11-
from pycspr.types.node.rpc import AuctionState
12-
from pycspr.types.node.rpc import Block
13-
from pycspr.types.node.rpc import BlockID
14-
from pycspr.types.node.rpc import BlockTransfers
15-
from pycspr.types.node.rpc import Deploy
16-
from pycspr.types.node.rpc import DeployHash
17-
from pycspr.types.node.rpc import DictionaryID
18-
from pycspr.types.node.rpc import EraSummary
19-
from pycspr.types.node.rpc import GlobalStateID
20-
from pycspr.types.node.rpc import NodePeer
21-
from pycspr.types.node.rpc import NodeStatus
22-
from pycspr.types.node.rpc import PurseID
23-
from pycspr.types.node.rpc import StateRootHash
24-
from pycspr.types.node.rpc import ValidatorChanges
25-
from pycspr.types.node.rpc import URef
9+
from pycspr.types.node import Address
10+
from pycspr.types.node import AccountInfo
11+
from pycspr.types.node import AuctionState
12+
from pycspr.types.node import Block
13+
from pycspr.types.node import BlockID
14+
from pycspr.types.node import BlockTransfers
15+
from pycspr.types.node import Deploy
16+
from pycspr.types.node import DeployHash
17+
from pycspr.types.node import DictionaryID
18+
from pycspr.types.node import EraSummary
19+
from pycspr.types.node import GlobalStateID
20+
from pycspr.types.node import NodePeer
21+
from pycspr.types.node import NodeStatus
22+
from pycspr.types.node import PurseID
23+
from pycspr.types.node import StateRootHash
24+
from pycspr.types.node import ValidatorChanges
25+
from pycspr.types.node import URef
2626

2727

2828
class Client():

‎pycspr/api/rpc/params.py

+13-13
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
from pycspr import serializer
44
from pycspr.crypto import checksummer
55
from pycspr.types.cl import CLV_Key
6-
from pycspr.types.node.rpc import Address
7-
from pycspr.types.node.rpc import BlockID
8-
from pycspr.types.node.rpc import DeployHash
9-
from pycspr.types.node.rpc import DictionaryID
10-
from pycspr.types.node.rpc import DictionaryID_AccountNamedKey
11-
from pycspr.types.node.rpc import DictionaryID_ContractNamedKey
12-
from pycspr.types.node.rpc import DictionaryID_SeedURef
13-
from pycspr.types.node.rpc import DictionaryID_UniqueKey
14-
from pycspr.types.node.rpc import GlobalStateID
15-
from pycspr.types.node.rpc import GlobalStateIDType
16-
from pycspr.types.node.rpc import PurseID
17-
from pycspr.types.node.rpc import PurseIDType
18-
from pycspr.types.node.rpc import StateRootHash
6+
from pycspr.types.node import Address
7+
from pycspr.types.node import BlockID
8+
from pycspr.types.node import DeployHash
9+
from pycspr.types.node import DictionaryID
10+
from pycspr.types.node import DictionaryID_AccountNamedKey
11+
from pycspr.types.node import DictionaryID_ContractNamedKey
12+
from pycspr.types.node import DictionaryID_SeedURef
13+
from pycspr.types.node import DictionaryID_UniqueKey
14+
from pycspr.types.node import GlobalStateID
15+
from pycspr.types.node import GlobalStateIDType
16+
from pycspr.types.node import PurseID
17+
from pycspr.types.node import PurseIDType
18+
from pycspr.types.node import StateRootHash
1919
from pycspr.utils import convertor
2020

2121

‎pycspr/api/rpc/proxy.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
from pycspr.api.rpc import params as param_utils
99
from pycspr.api.rpc.connection import ConnectionInfo
1010
from pycspr.types.crypto import DigestBytes
11-
from pycspr.types.node.rpc import Deploy
12-
from pycspr.types.node.rpc import Address
13-
from pycspr.types.node.rpc import BlockID
14-
from pycspr.types.node.rpc import DeployHash
15-
from pycspr.types.node.rpc import DictionaryID
16-
from pycspr.types.node.rpc import GlobalStateID
17-
from pycspr.types.node.rpc import GlobalStateIDType
18-
from pycspr.types.node.rpc import PurseID
19-
from pycspr.types.node.rpc import StateRootHash
11+
from pycspr.types.node import Deploy
12+
from pycspr.types.node import Address
13+
from pycspr.types.node import BlockID
14+
from pycspr.types.node import DeployHash
15+
from pycspr.types.node import DictionaryID
16+
from pycspr.types.node import GlobalStateID
17+
from pycspr.types.node import GlobalStateIDType
18+
from pycspr.types.node import PurseID
19+
from pycspr.types.node import StateRootHash
2020

2121

2222
class Proxy:

‎pycspr/api/rpc_speculative/client.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from pycspr.api.rpc_speculative.connection import ConnectionInfo
22
from pycspr.api.rpc_speculative.proxy import Proxy
3-
from pycspr.types.node.rpc import Deploy
4-
from pycspr.types.node.rpc import BlockID
3+
from pycspr.types.node import Deploy
4+
from pycspr.types.node import BlockID
55

66

77
class Client():

‎pycspr/api/rpc_speculative/proxy.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
from pycspr.api.rpc import params as param_utils
44
from pycspr.api.rpc.proxy import get_response
55
from pycspr.api.rpc_speculative.connection import ConnectionInfo
6-
from pycspr.types.node.rpc import Deploy
7-
from pycspr.types.node.rpc import BlockID
6+
from pycspr.types.node import Deploy
7+
from pycspr.types.node import BlockID
88

99

1010
class Proxy:

‎pycspr/api/sse/client.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
from pycspr.api.rpc import ConnectionInfo as RpcClientConnectionInfo
55
from pycspr.api.sse.connection import ConnectionInfo
66
from pycspr.api.sse.proxy import Proxy
7-
from pycspr.types.node.sse import NodeEventChannel
8-
from pycspr.types.node.sse import NodeEventInfo
9-
from pycspr.types.node.sse import NodeEventType
10-
from pycspr.types.node.sse import SSE_CHANNEL_TO_SSE_EVENT
7+
from pycspr.types.node import NodeEventChannel
8+
from pycspr.types.node import NodeEventInfo
9+
from pycspr.types.node import NodeEventType
10+
from pycspr.types.node import SSE_CHANNEL_TO_SSE_EVENT
1111

1212

1313
class Client():

‎pycspr/api/sse/proxy.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import sseclient
66

77
from pycspr.api.sse.connection import ConnectionInfo
8-
from pycspr.types.node.sse import NodeEventChannel
9-
from pycspr.types.node.sse import NodeEventInfo
10-
from pycspr.types.node.sse import NodeEventType
8+
from pycspr.types.node import NodeEventChannel
9+
from pycspr.types.node import NodeEventInfo
10+
from pycspr.types.node import NodeEventType
1111

1212

1313
class Proxy:

‎pycspr/factory/deploys.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
from pycspr.crypto import get_signature_for_deploy_approval
88
from pycspr.factory.digests import create_digest_of_deploy
99
from pycspr.factory.digests import create_digest_of_deploy_body
10-
from pycspr.types.node.rpc import Deploy
11-
from pycspr.types.node.rpc import DeployBody
12-
from pycspr.types.node.rpc import DeployHeader
13-
from pycspr.types.node.rpc import DeployParameters
14-
from pycspr.types.node.rpc import DeployTimeToLive
10+
from pycspr.types.node import Deploy
11+
from pycspr.types.node import DeployBody
12+
from pycspr.types.node import DeployHeader
13+
from pycspr.types.node import DeployParameters
14+
from pycspr.types.node import DeployTimeToLive
1515
from pycspr.types.cl import CLV_Option
1616
from pycspr.types.cl import CLT_Type_U64
1717
from pycspr.types.cl import CLV_U8
@@ -20,12 +20,12 @@
2020
from pycspr.types.cl import CLV_PublicKey
2121
from pycspr.types.cl import CLV_URef
2222
from pycspr.types.cl import CLV_Value
23-
from pycspr.types.node.rpc import DeployApproval
24-
from pycspr.types.node.rpc import DeployArgument
25-
from pycspr.types.node.rpc import DeployExecutableItem
26-
from pycspr.types.node.rpc import DeployOfModuleBytes
27-
from pycspr.types.node.rpc import DeployOfTransfer
28-
from pycspr.types.node.rpc import Timestamp
23+
from pycspr.types.node import DeployApproval
24+
from pycspr.types.node import DeployArgument
25+
from pycspr.types.node import DeployExecutableItem
26+
from pycspr.types.node import DeployOfModuleBytes
27+
from pycspr.types.node import DeployOfTransfer
28+
from pycspr.types.node import Timestamp
2929
from pycspr.utils import constants
3030
from pycspr.utils import convertor
3131
from pycspr.utils import io as _io

‎pycspr/factory/digests.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
from pycspr.types.cl import CLV_String
99
from pycspr.types.cl import CLV_U64
1010
from pycspr.types.cl import CLT_ByteArray
11-
from pycspr.types.node.rpc import BlockHeader
12-
from pycspr.types.node.rpc import DeployExecutableItem
13-
from pycspr.types.node.rpc import DeployHeader
11+
from pycspr.types.node import BlockHeader
12+
from pycspr.types.node import DeployExecutableItem
13+
from pycspr.types.node import DeployHeader
1414

1515

1616
def create_digest_of_block(header: BlockHeader) -> bytes:

‎pycspr/serializer/binary/node/decoder.py

+14-14
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111
from pycspr.types.crypto import KeyAlgorithm
1212
from pycspr.types.crypto import PublicKey
1313
from pycspr.types.crypto import Signature
14-
from pycspr.types.node.rpc import Deploy
15-
from pycspr.types.node.rpc import DeployApproval
16-
from pycspr.types.node.rpc import DeployArgument
17-
from pycspr.types.node.rpc import DeployBody
18-
from pycspr.types.node.rpc import DeployExecutableItem
19-
from pycspr.types.node.rpc import DeployHeader
20-
from pycspr.types.node.rpc import DeployTimeToLive
21-
from pycspr.types.node.rpc import DeployOfModuleBytes
22-
from pycspr.types.node.rpc import DeployOfStoredContractByHash
23-
from pycspr.types.node.rpc import DeployOfStoredContractByHashVersioned
24-
from pycspr.types.node.rpc import DeployOfStoredContractByName
25-
from pycspr.types.node.rpc import DeployOfStoredContractByNameVersioned
26-
from pycspr.types.node.rpc import DeployOfTransfer
27-
from pycspr.types.node.rpc import Timestamp
14+
from pycspr.types.node import Deploy
15+
from pycspr.types.node import DeployApproval
16+
from pycspr.types.node import DeployArgument
17+
from pycspr.types.node import DeployBody
18+
from pycspr.types.node import DeployExecutableItem
19+
from pycspr.types.node import DeployHeader
20+
from pycspr.types.node import DeployTimeToLive
21+
from pycspr.types.node import DeployOfModuleBytes
22+
from pycspr.types.node import DeployOfStoredContractByHash
23+
from pycspr.types.node import DeployOfStoredContractByHashVersioned
24+
from pycspr.types.node import DeployOfStoredContractByName
25+
from pycspr.types.node import DeployOfStoredContractByNameVersioned
26+
from pycspr.types.node import DeployOfTransfer
27+
from pycspr.types.node import Timestamp
2828
from pycspr.utils import convertor
2929

3030

0 commit comments

Comments
 (0)