Skip to content

Cairo formatting #217

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.

Sign up for GitHub

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

Merged
ericglau merged 5 commits into from
Jan 11, 2023
Merged

Cairo formatting #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d1ee81
Cairo formatting
ericglau Jan 11, 2023
134697b
Update snapshots
ericglau Jan 11, 2023
9afc3b8
Format long lines of args
ericglau Jan 11, 2023
1bf4b1d
Add comment
ericglau Jan 11, 2023
dff08c4
Update changelog
ericglau Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/core-cairo/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Unreleased

- Add ERC1155. ([#167](https://github.com/OpenZeppelin/contracts-wizard/pull/167))
- Update formatting. ([#217](https://github.com/OpenZeppelin/contracts-wizard/pull/217))
- **Breaking change**: Renamed `isApprovedForAll` return variable name (`isApproved` -> `approved`) in ERC721. ([#167](https://github.com/OpenZeppelin/contracts-wizard/pull/167))

## 0.5.0 (2022-09-22)
Expand Down
18 changes: 3 additions & 15 deletions packages/core-cairo/src/contract.test.ts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@ Generated by [AVA](https://avajs.dev).
from starkware.cairo.common.cairo_builtins import HashBuiltin␊
␊
@constructor␊
func constructor{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}() {␊
func constructor{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() {␊
someFunction();␊
return ();␊
}␊
Expand All @@ -45,11 +41,7 @@ Generated by [AVA](https://avajs.dev).
from starkware.cairo.common.cairo_builtins import HashBuiltin␊
␊
@constructor␊
func constructor{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}() {␊
func constructor{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() {␊
someFunction();␊
return ();␊
}␊
Expand Down Expand Up @@ -110,11 +102,7 @@ Generated by [AVA](https://avajs.dev).
from contracts.some.library import SomeLibrary␊
␊
@constructor␊
func constructor{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}() {␊
func constructor{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() {␊
SomeLibrary.initializer('param1');␊
return ();␊
}␊
Expand Down
Binary file modified packages/core-cairo/src/contract.test.ts.snap
View file
Open in desktop
Binary file not shown.
184 changes: 54 additions & 130 deletions packages/core-cairo/src/custom.test.ts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,9 @@ Generated by [AVA](https://avajs.dev).
from openzeppelin.access.ownable.library import Ownable␊
␊
@constructor␊
func constructor{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}(owner: felt) {␊
func constructor{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(␊
owner: felt␊
) {␊
Ownable.initializer(owner);␊
return ();␊
}␊
Expand All @@ -41,20 +39,12 @@ Generated by [AVA](https://avajs.dev).
//␊
␊
@view␊
func paused{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}() -> (paused: felt) {␊
func paused{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() -> (paused: felt) {␊
return Pausable.is_paused();␊
}␊
␊
@view␊
func owner{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}() -> (owner: felt) {␊
func owner{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() -> (owner: felt) {␊
return Ownable.owner();␊
}␊
␊
Expand All @@ -63,42 +53,28 @@ Generated by [AVA](https://avajs.dev).
//␊
␊
@external␊
func transferOwnership{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}(newOwner: felt) {␊
func transferOwnership{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(␊
newOwner: felt␊
) {␊
Ownable.transfer_ownership(newOwner);␊
return ();␊
}␊
␊
@external␊
func renounceOwnership{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}() {␊
func renounceOwnership{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() {␊
Ownable.renounce_ownership();␊
return ();␊
}␊
␊
@external␊
func pause{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}() {␊
func pause{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() {␊
Ownable.assert_only_owner();␊
Pausable._pause();␊
return ();␊
}␊
␊
@external␊
func unpause{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}() {␊
func unpause{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() {␊
Ownable.assert_only_owner();␊
Pausable._unpause();␊
return ();␊
Expand All @@ -118,11 +94,9 @@ Generated by [AVA](https://avajs.dev).
from openzeppelin.upgrades.library import Proxy␊
␊
@external␊
func initializer{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}(proxy_admin: felt) {␊
func initializer{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(␊
proxy_admin: felt␊
) {␊
Proxy.initializer(proxy_admin);␊
return ();␊
}␊
Expand All @@ -132,11 +106,9 @@ Generated by [AVA](https://avajs.dev).
//␊
␊
@external␊
func upgrade{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}(new_implementation: felt) -> () {␊
func upgrade{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(␊
new_implementation: felt␊
) -> () {␊
Proxy.assert_only_admin();␊
Proxy._set_implementation_hash(new_implementation);␊
return ();␊
Expand Down Expand Up @@ -165,11 +137,9 @@ Generated by [AVA](https://avajs.dev).
from openzeppelin.access.ownable.library import Ownable␊
␊
@constructor␊
func constructor{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}(owner: felt) {␊
func constructor{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(␊
owner: felt␊
) {␊
Ownable.initializer(owner);␊
return ();␊
}␊
Expand All @@ -179,11 +149,7 @@ Generated by [AVA](https://avajs.dev).
//␊
␊
@view␊
func owner{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}() -> (owner: felt) {␊
func owner{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() -> (owner: felt) {␊
return Ownable.owner();␊
}␊
␊
Expand All @@ -192,21 +158,15 @@ Generated by [AVA](https://avajs.dev).
//␊
␊
@external␊
func transferOwnership{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}(newOwner: felt) {␊
func transferOwnership{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(␊
newOwner: felt␊
) {␊
Ownable.transfer_ownership(newOwner);␊
return ();␊
}␊
␊
@external␊
func renounceOwnership{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}() {␊
func renounceOwnership{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() {␊
Ownable.renounce_ownership();␊
return ();␊
}␊
Expand All @@ -226,11 +186,9 @@ Generated by [AVA](https://avajs.dev).
from openzeppelin.utils.constants.library import DEFAULT_ADMIN_ROLE␊
␊
@constructor␊
func constructor{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}(admin: felt) {␊
func constructor{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(␊
admin: felt␊
) {␊
AccessControl.initializer();␊
␊
AccessControl._grant_role(DEFAULT_ADMIN_ROLE, admin);␊
Expand All @@ -242,20 +200,16 @@ Generated by [AVA](https://avajs.dev).
//␊
␊
@view␊
func hasRole{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}(role: felt, user: felt) -> (has_role: felt) {␊
func hasRole{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(␊
role: felt, user: felt␊
) -> (has_role: felt) {␊
return AccessControl.has_role(role, user);␊
}␊
␊
@view␊
func getRoleAdmin{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}(role: felt) -> (admin: felt) {␊
func getRoleAdmin{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(␊
role: felt␊
) -> (admin: felt) {␊
return AccessControl.get_role_admin(role);␊
}␊
␊
Expand All @@ -264,31 +218,25 @@ Generated by [AVA](https://avajs.dev).
//␊
␊
@external␊
func grantRole{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}(role: felt, user: felt) {␊
func grantRole{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(␊
role: felt, user: felt␊
) {␊
AccessControl.grant_role(role, user);␊
return ();␊
}␊
␊
@external␊
func revokeRole{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}(role: felt, user: felt) {␊
func revokeRole{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(␊
role: felt, user: felt␊
) {␊
AccessControl.revoke_role(role, user);␊
return ();␊
}␊
␊
@external␊
func renounceRole{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}(role: felt, user: felt) {␊
func renounceRole{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(␊
role: felt, user: felt␊
) {␊
AccessControl.renounce_role(role, user);␊
return ();␊
}␊
Expand All @@ -308,11 +256,9 @@ Generated by [AVA](https://avajs.dev).
from openzeppelin.access.ownable.library import Ownable␊
␊
@constructor␊
func constructor{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}(owner: felt) {␊
func constructor{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(␊
owner: felt␊
) {␊
Ownable.initializer(owner);␊
return ();␊
}␊
Expand All @@ -322,20 +268,12 @@ Generated by [AVA](https://avajs.dev).
//␊
␊
@view␊
func paused{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}() -> (paused: felt) {␊
func paused{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() -> (paused: felt) {␊
return Pausable.is_paused();␊
}␊
␊
@view␊
func owner{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}() -> (owner: felt) {␊
func owner{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() -> (owner: felt) {␊
return Ownable.owner();␊
}␊
␊
Expand All @@ -344,42 +282,28 @@ Generated by [AVA](https://avajs.dev).
//␊
␊
@external␊
func transferOwnership{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}(newOwner: felt) {␊
func transferOwnership{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(␊
newOwner: felt␊
) {␊
Ownable.transfer_ownership(newOwner);␊
return ();␊
}␊
␊
@external␊
func renounceOwnership{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}() {␊
func renounceOwnership{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() {␊
Ownable.renounce_ownership();␊
return ();␊
}␊
␊
@external␊
func pause{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}() {␊
func pause{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() {␊
Ownable.assert_only_owner();␊
Pausable._pause();␊
return ();␊
}␊
␊
@external␊
func unpause{␊
syscall_ptr: felt*,␊
pedersen_ptr: HashBuiltin*,␊
range_check_ptr␊
}() {␊
func unpause{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() {␊
Ownable.assert_only_owner();␊
Pausable._unpause();␊
return ();␊
Expand Down
Binary file modified packages/core-cairo/src/custom.test.ts.snap
View file
Open in desktop
Binary file not shown.
Loading