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

Jump to bottom

chore(pallets): restructure pallet smart contract #755

Merged
merged 14 commits into from
Jun 29, 2023
Merged

chore(pallets): restructure pallet smart contract #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
309352d
chore: move service contract logic to service_contract.rs file
renauter Jun 21, 2023
518f149
chore: move billing logic to billing.rs file
renauter Jun 21, 2023
16f2dab
chore: rework service contract
renauter Jun 21, 2023
de8c331
chore: move grid contract logic to grid_contract.rs file
renauter Jun 21, 2023
f413e3b
chore: move solution provider logic to solution_provider.rs file
renauter Jun 21, 2023
ec81ef9
chore: update lib.rs file
renauter Jun 21, 2023
f0c8cd2
fix: mock.rs
renauter Jun 21, 2023
4e64756
wip
renauter Jun 27, 2023
cf24884
Merge branch 'development' into development_restructure_pallet_smart_…
renauter Jun 27, 2023
f71d020
fix rebase
renauter Jun 27, 2023
fbf0b30
remove `name_contract.rs`
renauter Jun 28, 2023
96fed09
chore: improve readability for resource cost calculation
renauter Jun 28, 2023
eef6de5
chore: remove comment
renauter Jun 28, 2023
84827ca
chore: improve readability for `handle_lock()`
renauter Jun 28, 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
23 changes: 13 additions & 10 deletions substrate-node/pallets/pallet-smart-contract/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use frame_benchmarking::{account, benchmarks, whitelisted_caller};
use frame_support::{
assert_ok,
traits::{OnFinalize, OnInitialize},
BoundedVec,
};
use frame_system::{EventRecord, Pallet as System, RawOrigin};
use pallet_balances::Pallet as Balances;
Expand All @@ -14,12 +15,15 @@ use pallet_tfgrid::{
CityNameInput, CountryNameInput, DocumentHashInput, DocumentLinkInput, Gw4Input, Ip4Input,
LatitudeInput, LongitudeInput, Pallet as TfgridModule, PkInput, RelayInput, ResourcesInput,
};
use pallet_timestamp::Pallet as Timestamp;
use sp_runtime::traits::{Bounded, One, StaticLookup};
use sp_runtime::{
traits::{Bounded, One, StaticLookup},
SaturatedConversion,
};
use sp_std::{
convert::{TryFrom, TryInto},
fmt::Debug,
vec,
vec::Vec,
};
use tfchain_support::{
resources::Resources,
Expand Down Expand Up @@ -154,7 +158,7 @@ benchmarks! {

let report = types::NruConsumption {
contract_id: contract_id,
timestamp: Timestamp::<T>::get().saturated_into::<u64>() / 1000,
timestamp: SmartContractModule::<T>::get_current_timestamp_in_secs(),
window: 1000,
nru: 10 * GIGABYTE,
};
Expand Down Expand Up @@ -258,9 +262,7 @@ benchmarks! {
let solution_provider_id = 1;
assert!(SmartContractModule::<T>::solution_providers(solution_provider_id).is_some());
let solution_provider = SmartContractModule::<T>::solution_providers(solution_provider_id).unwrap();
assert_eq!(
solution_provider.providers, providers
);
assert_eq!(solution_provider.providers, providers);
assert_last_event::<T>(Event::SolutionProviderCreated(solution_provider).into());
}

Expand All @@ -276,6 +278,7 @@ benchmarks! {
verify {
assert!(SmartContractModule::<T>::solution_providers(solution_provider_id).is_some());
let solution_provider = SmartContractModule::<T>::solution_providers(solution_provider_id).unwrap();
assert_eq!(solution_provider.approved, approve);
assert_last_event::<T>(Event::SolutionProviderApproved(solution_provider_id, approve).into());
}

Expand All @@ -292,10 +295,10 @@ benchmarks! {
_create_node_contract::<T>(user.clone());
let contract_id = 1;

let now = Timestamp::<T>::get().saturated_into::<u64>() / 1000;
let now = SmartContractModule::<T>::get_current_timestamp_in_secs();
let elapsed_seconds = 5; // need to be < 6 secs to bill at same block!
let then: u64 = now + elapsed_seconds;
Timestamp::<T>::set_timestamp((then * 1000).try_into().unwrap());
pallet_timestamp::Pallet::<T>::set_timestamp((then * 1000).try_into().unwrap());

_push_contract_used_resources_report::<T>(farmer.clone());
_push_contract_nru_consumption_report::<T>(farmer.clone(), then, elapsed_seconds);
Expand All @@ -309,7 +312,7 @@ benchmarks! {
assert_eq!(lock.amount_locked, cost);
let contract_bill = types::ContractBill {
contract_id,
timestamp: <Timestamp<T>>::get().saturated_into::<u64>() / 1000,
timestamp: SmartContractModule::<T>::get_current_timestamp_in_secs(),
discount_level: types::DiscountLevel::Gold,
amount_billed: cost.saturated_into::<u128>(),
};
Expand Down Expand Up @@ -810,7 +813,7 @@ pub(crate) fn get_public_ip_gw_input(public_ip_gw_input: &[u8]) -> Gw4Input {
BoundedVec::try_from(public_ip_gw_input.to_vec()).expect("Invalid public ip (gw) input.")
}

pub(crate) fn get_deployment_hash_input(deployment_hash_input: &[u8]) -> HexHash {
pub(crate) fn get_deployment_hash_input(deployment_hash_input: &[u8]) -> types::HexHash {
deployment_hash_input
.to_vec()
.try_into()
Expand Down
Loading