Skip to content

Commit

Permalink
fix: randomness requestor typos
Browse files Browse the repository at this point in the history
  • Loading branch information
julio4 committed Oct 3, 2024
1 parent 4afb7e0 commit 4e66004
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 17 deletions.
5 changes: 4 additions & 1 deletion _typos.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[default]
extend-ignore-identifiers-re = ["requestor", "REQUESTOR", "Requestor"]

[type.po]
extend-glob = ["*.po", "*.css", "*.js"]
check-file = false

[files]
extend-exclude = ["po/*.po", "listings/**/*.json"]
extend-exclude = ["po/*.po", "listings/**/*.json"]
8 changes: 4 additions & 4 deletions listings/applications/coin_flip/src/contract.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pub trait ICoinFlip<TContractState> {
pub trait IPragmaVRF<TContractState> {
fn receive_random_words(
ref self: TContractState,
requester_address: ContractAddress,
requestor_address: ContractAddress,
request_id: u64,
random_words: Span<felt252>,
calldata: Array<felt252>
Expand Down Expand Up @@ -65,7 +65,7 @@ pub mod CoinFlip {
pub const CALLER_NOT_RANDOMNESS: felt252 = 'Caller not randomness contract';
pub const INVALID_ADDRESS: felt252 = 'Invalid address';
pub const INVALID_FLIP_ID: felt252 = 'No flip with the given ID';
pub const REQUESTER_NOT_SELF: felt252 = 'Requester is not self';
pub const REQUESTOR_NOT_SELF: felt252 = 'Requestor is not self';
pub const TRANSFER_FAILED: felt252 = 'Transfer failed';
}

Expand Down Expand Up @@ -103,7 +103,7 @@ pub mod CoinFlip {
impl PragmaVRF of super::IPragmaVRF<ContractState> {
fn receive_random_words(
ref self: ContractState,
requester_address: ContractAddress,
requestor_address: ContractAddress,
request_id: u64,
random_words: Span<felt252>,
calldata: Array<felt252>
Expand All @@ -114,7 +114,7 @@ pub mod CoinFlip {
);

let this = get_contract_address();
assert(requester_address == this, Errors::REQUESTER_NOT_SELF);
assert(requestor_address == this, Errors::REQUESTOR_NOT_SELF);

self._process_coin_flip(request_id, random_words.at(0));
}
Expand Down
24 changes: 12 additions & 12 deletions listings/applications/coin_flip/src/mock_randomness.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ pub mod MockRandomness {
fn submit_random(
ref self: ContractState,
request_id: u64,
requester_address: ContractAddress,
requestor_address: ContractAddress,
seed: u64,
minimum_block_number: u64,
callback_address: ContractAddress,
Expand All @@ -72,11 +72,11 @@ pub mod MockRandomness {
proof: Span<felt252>,
calldata: Array<felt252>
) {
let requester = IPragmaVRFDispatcher { contract_address: callback_address };
requester.receive_random_words(requester_address, request_id, random_words, calldata);
let requestor = IPragmaVRFDispatcher { contract_address: callback_address };
requestor.receive_random_words(requestor_address, request_id, random_words, calldata);
let eth_dispatcher = self.eth_dispatcher.read();
let success = eth_dispatcher
.transfer(requester_address, (callback_fee_limit - callback_fee).into());
.transfer(requestor_address, (callback_fee_limit - callback_fee).into());
assert(success, Errors::TRANSFER_FAILED);
}

Expand All @@ -92,7 +92,7 @@ pub mod MockRandomness {
}
fn update_status(
ref self: ContractState,
requester_address: ContractAddress,
requestor_address: ContractAddress,
request_id: u64,
new_status: RequestStatus
) {
Expand All @@ -102,7 +102,7 @@ pub mod MockRandomness {
fn cancel_random_request(
ref self: ContractState,
request_id: u64,
requester_address: ContractAddress,
requestor_address: ContractAddress,
seed: u64,
minimum_block_number: u64,
callback_address: ContractAddress,
Expand All @@ -113,22 +113,22 @@ pub mod MockRandomness {
}

fn get_pending_requests(
self: @ContractState, requester_address: ContractAddress, offset: u64, max_len: u64
self: @ContractState, requestor_address: ContractAddress, offset: u64, max_len: u64
) -> Span<felt252> {
panic!("unimplemented")
}

fn get_request_status(
self: @ContractState, requester_address: ContractAddress, request_id: u64
self: @ContractState, requestor_address: ContractAddress, request_id: u64
) -> RequestStatus {
panic!("unimplemented")
}
fn requester_current_index(
self: @ContractState, requester_address: ContractAddress
fn requestor_current_index(
self: @ContractState, requestor_address: ContractAddress
) -> u64 {
panic!("unimplemented")
}
fn get_public_key(self: @ContractState, requester_address: ContractAddress) -> felt252 {
fn get_public_key(self: @ContractState, requestor_address: ContractAddress) -> felt252 {
panic!("unimplemented")
}
fn get_payment_token(self: @ContractState) -> ContractAddress {
Expand All @@ -146,7 +146,7 @@ pub mod MockRandomness {
panic!("unimplemented")
}
fn get_out_of_gas_requests(
self: @ContractState, requester_address: ContractAddress,
self: @ContractState, requestor_address: ContractAddress,
) -> Span<u64> {
panic!("unimplemented")
}
Expand Down

0 comments on commit 4e66004

Please sign in to comment.