Skip to content
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

Add owner param to ownable initializer #660

Merged
merged 4 commits into from
Jul 13, 2023
Merged

Add owner param to ownable initializer #660

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f99a075
feat: add owner param to ownable initializer
ericnordelo Jul 13, 2023
b3655fc
feat: apply review updates
ericnordelo Jul 13, 2023
97dd40d
fix: remove unnecessary mut
ericnordelo Jul 13, 2023
90fbf41
Update src/openzeppelin/tests/access/test_dual_ownable.cairo
ericnordelo Jul 13, 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
5 changes: 2 additions & 3 deletions src/openzeppelin/access/ownable/ownable.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,8 @@ mod Ownable {
// Internals

#[internal]
fn initializer() {
let caller: ContractAddress = get_caller_address();
_transfer_ownership(caller);
fn initializer(owner: ContractAddress) {
_transfer_ownership(owner);
}

#[internal]
Expand Down
8 changes: 4 additions & 4 deletions src/openzeppelin/tests/access/test_dual_ownable.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use core::clone::Clone;
ericnordelo marked this conversation as resolved.
Show resolved Hide resolved
use array::ArrayTrait;
use starknet::ContractAddress;
use starknet::contract_address_const;
Expand All @@ -17,6 +18,7 @@ use openzeppelin::tests::mocks::dual_ownable_mocks::SnakeOwnablePanicMock;
use openzeppelin::tests::mocks::dual_ownable_mocks::CamelOwnablePanicMock;
use openzeppelin::tests::mocks::non_implementing_mock::NonImplementingMock;
use openzeppelin::tests::utils;
use openzeppelin::utils::serde::SerializedAppend;

//
// Constants
Expand All @@ -36,14 +38,14 @@ fn NEW_OWNER() -> ContractAddress {

fn setup_snake() -> (DualCaseOwnable, IOwnableDispatcher) {
let mut calldata = ArrayTrait::new();
set_caller_address(OWNER());
calldata.append_serde(OWNER());
let target = utils::deploy(SnakeOwnableMock::TEST_CLASS_HASH, calldata);
(DualCaseOwnable { contract_address: target }, IOwnableDispatcher { contract_address: target })
}

fn setup_camel() -> (DualCaseOwnable, IOwnableCamelDispatcher) {
let mut calldata = ArrayTrait::new();
set_caller_address(OWNER());
calldata.append_serde(OWNER());
let target = utils::deploy(CamelOwnableMock::TEST_CLASS_HASH, calldata);
(
DualCaseOwnable {
Expand All @@ -56,13 +58,11 @@ fn setup_camel() -> (DualCaseOwnable, IOwnableCamelDispatcher) {

fn setup_non_ownable() -> DualCaseOwnable {
let calldata = ArrayTrait::new();
set_caller_address(OWNER());
let target = utils::deploy(NonImplementingMock::TEST_CLASS_HASH, calldata);
DualCaseOwnable { contract_address: target }
}

fn setup_ownable_panic() -> (DualCaseOwnable, DualCaseOwnable) {
set_caller_address(OWNER());
let snake_target = utils::deploy(SnakeOwnablePanicMock::TEST_CLASS_HASH, ArrayTrait::new());
let camel_target = utils::deploy(CamelOwnablePanicMock::TEST_CLASS_HASH, ArrayTrait::new());
(
Expand Down
2 changes: 1 addition & 1 deletion src/openzeppelin/tests/access/test_ownable.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fn OTHER() -> ContractAddress {

fn setup() {
testing::set_caller_address(OWNER());
Ownable::initializer();
Ownable::initializer(OWNER());
}

//
Expand Down
8 changes: 4 additions & 4 deletions src/openzeppelin/tests/mocks/dual_ownable_mocks.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ mod SnakeOwnableMock {
use openzeppelin::access::ownable::Ownable;

#[constructor]
fn constructor() {
Ownable::initializer();
fn constructor(owner: ContractAddress) {
Ownable::initializer(owner);
}

#[view]
Expand All @@ -30,8 +30,8 @@ mod CamelOwnableMock {
use openzeppelin::access::ownable::Ownable;

#[constructor]
fn constructor() {
Ownable::initializer();
fn constructor(owner: ContractAddress) {
Ownable::initializer(owner);
}

#[view]
Expand Down