Skip to content

Commit 7745c9d

Browse files
authored
Remove unknown=EXCLUDE after devnet fix response (#1391)
* unknown=EXCLUDE ramoved * devnet version bump to 0.1.2 and test fix * fix tests with pending block * delete print * remove exclude from get_block * remove comments
1 parent ef4992d commit 7745c9d

File tree

4 files changed

+11
-19
lines changed

4 files changed

+11
-19
lines changed

starknet_py/net/full_node_client.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from typing import List, Optional, Tuple, Union, cast
22

33
import aiohttp
4-
from marshmallow import EXCLUDE
54

65
from starknet_py.constants import RPC_CONTRACT_ERROR
76
from starknet_py.hash.utils import keccak256
@@ -119,11 +118,8 @@ async def get_block(
119118
params=block_identifier,
120119
)
121120
if block_identifier == {"block_id": "pending"}:
122-
return cast(
123-
PendingStarknetBlock,
124-
PendingStarknetBlockSchema().load(res, unknown=EXCLUDE),
125-
)
126-
return cast(StarknetBlock, StarknetBlockSchema().load(res, unknown=EXCLUDE))
121+
return cast(PendingStarknetBlock, PendingStarknetBlockSchema().load(res))
122+
return cast(StarknetBlock, StarknetBlockSchema().load(res))
127123

128124
async def get_block_with_txs(
129125
self,
@@ -132,7 +128,6 @@ async def get_block_with_txs(
132128
) -> Union[StarknetBlock, PendingStarknetBlock]:
133129
return await self.get_block(block_hash=block_hash, block_number=block_number)
134130

135-
# TODO (#1323): remove unknown=EXCLUDE after devnet response fix
136131
async def get_block_with_tx_hashes(
137132
self,
138133
block_hash: Optional[Union[Hash, Tag]] = None,
@@ -150,7 +145,7 @@ async def get_block_with_tx_hashes(
150145
if block_identifier == {"block_id": "pending"}:
151146
return cast(
152147
PendingStarknetBlockWithTxHashes,
153-
PendingStarknetBlockWithTxHashesSchema().load(res, unknown=EXCLUDE),
148+
PendingStarknetBlockWithTxHashesSchema().load(res),
154149
)
155150
return cast(
156151
StarknetBlockWithTxHashes,
@@ -288,7 +283,6 @@ async def _get_events_chunk(
288283
return res["events"], res["continuation_token"]
289284
return res["events"], None
290285

291-
# TODO (#1323): remove unknown=EXCLUDE after devnet fix response
292286
async def get_state_update(
293287
self,
294288
block_hash: Optional[Union[Hash, Tag]] = None,
@@ -306,7 +300,7 @@ async def get_state_update(
306300
if block_identifier == {"block_id": "pending"}:
307301
return cast(
308302
PendingBlockStateUpdate,
309-
PendingBlockStateUpdateSchema().load(res, unknown=EXCLUDE),
303+
PendingBlockStateUpdateSchema().load(res),
310304
)
311305
return cast(BlockStateUpdate, BlockStateUpdateSchema().load(res))
312306

starknet_py/tests/e2e/client/client_test.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from starknet_py.hash.storage import get_storage_var_address
1111
from starknet_py.net.client_errors import ClientError
1212
from starknet_py.net.client_models import (
13+
BlockStateUpdate,
1314
Call,
1415
DeclaredContractHash,
1516
DeclareTransactionV1,
@@ -21,7 +22,6 @@
2122
FeePayment,
2223
InvokeTransactionV1,
2324
L1HandlerTransaction,
24-
PendingBlockStateUpdate,
2525
PriceUnit,
2626
ResourceBounds,
2727
SierraContractClass,
@@ -498,10 +498,10 @@ async def test_state_update_storage_diffs(
498498
)
499499
await resp.wait_for_acceptance()
500500

501-
state_update = await client.get_state_update()
501+
state_update = await client.get_state_update(block_number="latest")
502502

503503
assert len(state_update.state_diff.storage_diffs) != 0
504-
assert isinstance(state_update, PendingBlockStateUpdate)
504+
assert isinstance(state_update, BlockStateUpdate)
505505

506506

507507
@pytest.mark.run_on_devnet
@@ -510,7 +510,6 @@ async def test_state_update_deployed_contracts(
510510
class_hash,
511511
account,
512512
):
513-
# setup
514513
deployer = Deployer()
515514
contract_deployment = deployer.create_contract_deployment(class_hash=class_hash)
516515
deploy_invoke_tx = await account.sign_invoke_v1(
@@ -519,11 +518,10 @@ async def test_state_update_deployed_contracts(
519518
resp = await account.client.send_transaction(deploy_invoke_tx)
520519
await account.client.wait_for_tx(resp.transaction_hash)
521520

522-
# test
523-
state_update = await account.client.get_state_update()
521+
state_update = await account.client.get_state_update(block_number="latest")
524522

525523
assert len(state_update.state_diff.deployed_contracts) != 0
526-
assert isinstance(state_update, PendingBlockStateUpdate)
524+
assert isinstance(state_update, BlockStateUpdate)
527525

528526

529527
@pytest.mark.asyncio

starknet_py/tests/e2e/client/full_node_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ async def test_get_events_nonexistent_starting_block(
319319
client,
320320
simple_storage_with_event_contract: Contract,
321321
):
322-
with pytest.raises(ClientError, match="No block found"):
322+
with pytest.raises(ClientError, match="Block not found."):
323323
await client.get_events(
324324
from_block_number=10000,
325325
to_block_hash="latest",

starknet_py/tests/install_devnet.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e
33

44
DEVNET_INSTALL_DIR="$(git rev-parse --show-toplevel)/starknet_py/tests/e2e/devnet/bin"
55
DEVNET_REPO="https://github.com/0xSpaceShard/starknet-devnet-rs"
6-
DEVNET_VERSION="v0.0.5"
6+
DEVNET_VERSION="v0.1.2"
77

88
require_cmd() {
99
if ! command -v "$1" >/dev/null 2>&1; then

0 commit comments

Comments
 (0)