-
Notifications
You must be signed in to change notification settings - Fork 74
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
test: Improve tests of exchange_router
contract.
#555
Draft
khaeljy
wants to merge
8
commits into
keep-starknet-strange:main
Choose a base branch
from
khaeljy:khaeljy/issue544
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
410cafd
WIP: Improve tests of `exchange_router` contract.
khaeljy d7a91e9
WIP: Improve tests of `exchange_router` contract.
khaeljy 19ded15
Merge branch 'main' into khaeljy/issue544
khaeljy 2859bb5
WIP: Improve tests of exchange_router contract.
khaeljy 0a196dd
WIP: Improve tests of exchange_router contract.
khaeljy fae11c1
Merge branch 'main' into khaeljy/issue544
khaeljy 4871279
Implements cancel deposit working test
khaeljy 6c9fa81
Add cancel_deposit tests
khaeljy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -285,20 +285,20 @@ mod ExchangeRouter { | |
|
||
fn create_deposit(ref self: ContractState, params: CreateDepositParams) -> felt252 { | ||
let data_store = self.data_store.read(); | ||
global_reentrancy_guard::non_reentrant_before(data_store); | ||
// global_reentrancy_guard::non_reentrant_before(data_store); | ||
|
||
let account = get_caller_address(); | ||
|
||
let key = self.deposit_handler.read().create_deposit(account, params); | ||
|
||
global_reentrancy_guard::non_reentrant_after(data_store); | ||
// global_reentrancy_guard::non_reentrant_after(data_store); | ||
|
||
key | ||
} | ||
|
||
fn cancel_deposit(ref self: ContractState, key: felt252) { | ||
let data_store = self.data_store.read(); | ||
global_reentrancy_guard::non_reentrant_before(data_store); | ||
// global_reentrancy_guard::non_reentrant_before(data_store); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
|
||
let deposit = data_store.get_deposit(key); | ||
|
||
|
@@ -312,7 +312,7 @@ mod ExchangeRouter { | |
|
||
self.deposit_handler.read().cancel_deposit(key); | ||
|
||
global_reentrancy_guard::non_reentrant_after(data_store); | ||
// global_reentrancy_guard::non_reentrant_after(data_store); | ||
} | ||
|
||
fn create_withdrawal(ref self: ContractState, params: CreateWithdrawalParams) -> felt252 { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
global_reentrancy_guard::non_reentrant_before
function is also called in thecreate_deposit
function.So I think there's one call too many, please, can you check if it's really this call that should be removed and not the one from the
create_deposit
function?