Skip to content

Commit

Permalink
chore: scarb fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
Darlington02 committed Oct 3, 2024
1 parent 6e7611b commit c184474
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 29 deletions.
8 changes: 5 additions & 3 deletions src/base/constants/contract_addresses.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ pub mod Addresses {
pub const STRK: felt252 = 0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d;
pub const USDT: felt252 = 0x057e859eEE48E899CeF91cf0595661BEc0634dB7d593d98222C68Af6472e8394;
pub const USDC: felt252 = 0x053b40A647CEDfca6cA84f542A0fe36736031905A9639a7f19A3C1e66bFd5080;
pub const PRAGMA_ORACLE: felt252 = 0x36031daa264c24520b11d93af622c848b2499b66b41d611bac95e13cfca131a;
pub const PRAGMA_ORACLE: felt252 =
0x36031daa264c24520b11d93af622c848b2499b66b41d611bac95e13cfca131a;
// pub const USDT: felt252 = 0x068f5c6a61780768455de69077e07e89787839bf8166decfbf92b645209c0fb8;
// pub const USDC: felt252 = 0x053c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8;
// pub const PRAGMA_ORACLE: felt252 = 0x2a85bd616f912537c50a49a4076db02c00b29b2cdc8a197ce92ed1837fa875b;
// pub const USDC: felt252 = 0x053c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8;
// pub const PRAGMA_ORACLE: felt252 =
// 0x2a85bd616f912537c50a49a4076db02c00b29b2cdc8a197ce92ed1837fa875b;
}
20 changes: 10 additions & 10 deletions src/jolt/jolt.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -585,25 +585,25 @@ pub mod Jolt {
let erc20_symbol = dispatcher.symbol();
if (erc20_symbol == "ETH") {
KEY = 19514442401534788;
}
else if(erc20_symbol == "STRK") {
} else if (erc20_symbol == "STRK") {
KEY = 6004514686061859652;
}
else if(erc20_symbol == "USDT") {
} else if (erc20_symbol == "USDT") {
KEY = 6148333044652921668;
}
else if(erc20_symbol == "USDC") {
} else if (erc20_symbol == "USDC") {
KEY = 6148332971638477636;
}

let oracle_address : ContractAddress = Addresses::PRAGMA_ORACLE.try_into().unwrap();
let oracle_address: ContractAddress = Addresses::PRAGMA_ORACLE.try_into().unwrap();
let price = self._get_asset_price_median(oracle_address, DataType::SpotEntry(KEY));
price.try_into().unwrap()
}

fn _get_asset_price_median(ref self: ContractState, oracle_address: ContractAddress, asset : DataType) -> u128 {
let oracle_dispatcher = IPragmaABIDispatcher{contract_address : oracle_address};
let output : PragmaPricesResponse= oracle_dispatcher.get_data(asset, AggregationMode::Median(()));
fn _get_asset_price_median(
ref self: ContractState, oracle_address: ContractAddress, asset: DataType
) -> u128 {
let oracle_dispatcher = IPragmaABIDispatcher { contract_address: oracle_address };
let output: PragmaPricesResponse = oracle_dispatcher
.get_data(asset, AggregationMode::Median(()));
return output.price;
}
}
Expand Down
21 changes: 10 additions & 11 deletions tests/test_jolt.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,26 @@ use snforge_std::{
stop_cheat_block_timestamp
};
use karst::interfaces::IJolt::{IJoltDispatcher, IJoltDispatcherTrait};
use karst::base::{
constants::errors::Errors,
constants::types::{joltData, joltParams, JoltType, JoltCurrency, JoltStatus, RenewalData}
};

const ADMIN: felt252 = 13245;
const ADDRESS1: felt252 = 53435;
const ADDRESS2: felt252 = 204925;
const ADDRESS3: felt252 = 249205;

// *************************************************************************
// SETUP
// *************************************************************************
fn __setup__() -> ContractAddress {
let jolt_contract = declare("Jolt").unwrap().contract_class();
let (jolt_contract_address, _) = jolt_contract
.deploy(@array![ADMIN])
.unwrap();
let (jolt_contract_address, _) = jolt_contract.deploy(@array![ADMIN]).unwrap();
return (jolt_contract_address);
}

// *************************************************************************
// TEST
// *************************************************************************
#[test]
fn test_constructor() {
let jolt_contract_address = __setup__();
let dispatcher = IJoltDispatcher{ contract_address: jolt_contract_address };
let owner = dispatcher.owner();
assert(owner == ADMIN.try_into().unwrap(), 'invalid owner!');
}


8 changes: 3 additions & 5 deletions tests/test_publication.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@ use core::traits::{TryInto, Into};
use starknet::{ContractAddress, get_block_timestamp};

use snforge_std::{
declare, start_cheat_caller_address, stop_cheat_caller_address, spy_events, EventSpyAssertionsTrait, ContractClassTrait,
DeclareResultTrait, EventSpy
declare, start_cheat_caller_address, stop_cheat_caller_address, spy_events,
EventSpyAssertionsTrait, ContractClassTrait, DeclareResultTrait, EventSpy
};
use karst::publication::publication::PublicationComponent::{
Event as PublicationEvent, Post, CommentCreated, RepostCreated, Upvoted, Downvoted
};
use karst::mocks::interfaces::IComposable::{IComposableDispatcher, IComposableDispatcherTrait};
use karst::base::constants::types::{
PostParams, RepostParams, CommentParams, PublicationType
};
use karst::base::constants::types::{PostParams, RepostParams, CommentParams, PublicationType};

const HUB_ADDRESS: felt252 = 'HUB';
const USER_ONE: felt252 = 'BOB';
Expand Down

0 comments on commit c184474

Please sign in to comment.