Skip to content

Commit c4e9d93

Browse files
committed
πŸ› Remove value as an input
1 parent f6867ba commit c4e9d93

7 files changed

Lines changed: 9 additions & 14 deletions

File tree

β€Žsrc/interfaces/minter.cairoβ€Ž

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ namespace ICarbonableMinter {
5858
func getMigrationValue() -> (value: Uint256) {
5959
}
6060
61-
func initializeMigration(
62-
source_address: felt, target_address: felt, slot: Uint256, value: Uint256
63-
) {
61+
func initializeMigration(source_address: felt, target_address: felt, slot: Uint256) {
6462
}
6563
6664
func migrate(tokenId: Uint256) -> (newTokenId: Uint256) {

β€Žsrc/mint/minter.cairoβ€Ž

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,10 @@ func getMigrationValue{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_che
206206
// @param value The target value to mint.
207207
@external
208208
func initializeMigration{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
209-
source_address: felt, target_address: felt, slot: Uint256, value: Uint256
209+
source_address: felt, target_address: felt, slot: Uint256
210210
) {
211211
Ownable.assert_only_owner();
212+
let (value) = getUnitPrice();
212213
Migrator.initializer(source_address, target_address, slot, value);
213214
CarbonableInitializer.initialize(MIGRATION);
214215
return ();

β€Žtests/integrations/protocol/library.cairoβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ func setup{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}() {
252252
admin_instance.vester_transfer_ownership(carbonable_yielder);
253253

254254
// Set up migrator
255-
admin_instance.initialize_migration(carbonable_project, carbonable_3525_address, 1, 100);
255+
admin_instance.initialize_migration(carbonable_project, carbonable_3525_address, 1);
256256

257257
return ();
258258
}

β€Žtests/integrations/protocol/libs/admin.cairoβ€Ž

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -814,18 +814,16 @@ namespace instance {
814814
}
815815

816816
func initialize_migration{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
817-
source_address: felt, target_address: felt, slot: felt, value: felt
817+
source_address: felt, target_address: felt, slot: felt
818818
) {
819819
let slot_u256 = Uint256(low=slot, high=0);
820-
let value_u256 = Uint256(low=value, high=0);
821820
let (carbonable_minter) = carbonable_minter_instance.get_address();
822821
let (caller) = get_address();
823822
with carbonable_minter {
824823
carbonable_minter_instance.initialize_migration(
825824
source_address=source_address,
826825
target_address=target_address,
827826
slot=slot_u256,
828-
value=value_u256,
829827
caller=caller,
830828
);
831829
}

β€Žtests/integrations/protocol/libs/anyone.cairoβ€Ž

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -665,18 +665,16 @@ namespace instance {
665665
}
666666

667667
func initialize_migration{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
668-
source_address: felt, target_address: felt, slot: felt, value: felt
668+
source_address: felt, target_address: felt, slot: felt
669669
) {
670670
let slot_u256 = Uint256(low=slot, high=0);
671-
let value_u256 = Uint256(low=value, high=0);
672671
let (carbonable_minter) = carbonable_minter_instance.get_address();
673672
let (caller) = get_address();
674673
with carbonable_minter {
675674
carbonable_minter_instance.initialize_migration(
676675
source_address=source_address,
677676
target_address=target_address,
678677
slot=slot_u256,
679-
value=value_u256,
680678
caller=caller,
681679
);
682680
}

β€Žtests/integrations/protocol/libs/minter.cairoβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@ namespace instance {
160160

161161
func initialize_migration{
162162
syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr, carbonable_minter: felt
163-
}(source_address: felt, target_address: felt, slot: Uint256, value: Uint256, caller: felt) {
163+
}(source_address: felt, target_address: felt, slot: Uint256, caller: felt) {
164164
%{ stop_prank = start_prank(caller_address=ids.caller, target_contract_address=ids.carbonable_minter) %}
165165
ICarbonableMinter.initializeMigration(
166-
carbonable_minter, source_address, target_address, slot, value
166+
carbonable_minter, source_address, target_address, slot
167167
);
168168
%{ stop_prank() %}
169169
return ();

β€Žtests/integrations/protocol/test_minter.cairoβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ func test_initialize_migration_revert_not_owner{
221221
alloc_locals;
222222

223223
%{ expect_revert("TRANSACTION_FAILED", "Ownable: caller is not the owner") %}
224-
anyone.initialize_migration(0, 0, 0, 0);
224+
anyone.initialize_migration(0, 0, 0);
225225

226226
return ();
227227
}

0 commit comments

Comments
Β (0)