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

remove unused code and comments #231

Merged
merged 2 commits into from
Sep 25, 2023
Merged

remove unused code and comments #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd0dcf4
remove unused code and comments
yeousunn Sep 19, 2023
d931ba8
Merge branch 'CESSProject:main' into main
yeousunn Sep 20, 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
8 changes: 0 additions & 8 deletions node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ sp-inherents = { version = "4.0.0-dev", git = "https://github.com/CESSProject/su
sp-keyring = { version = "7.0.0", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
sp-keystore = { version = "0.13.0", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
sp-consensus = { version = "0.10.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
# sp-transaction-pool
sp-transaction-storage-proof = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
# sp-io

# client dependencies
sc-client-api = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
Expand All @@ -65,21 +63,15 @@ sc-sysinfo = { version = "6.0.0-dev", git = "https://github.com/CESSProject/subs

# frame dependencies
frame-system = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
# frame-system-rpc-runtime-api = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
pallet-transaction-payment = { version = "4.0.0-dev", default-features = false, git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
# pallet-assets
# pallet-asset-tx-payment
pallet-im-online = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }

# node-specific dependencies
cess-node-runtime = { path = "../runtime" }
# node-rpc
# node-primitives

# CLI-specific dependencies
sc-cli = { version = "0.10.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
frame-benchmarking-cli = { version = "4.0.0-dev", git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
# node-inspect
try-runtime-cli = { version = "0.10.0-dev", optional = true, git = "https://github.com/CESSProject/substrate.git", branch = "cess-polkadot-v0.9.36" }
serde_json = "1.0.85"

Expand Down
59 changes: 0 additions & 59 deletions runtime/src/constants.rs
View file
Open in desktop

This file was deleted.

73 changes: 41 additions & 32 deletions runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ pub fn wasm_binary_unwrap() -> &'static [u8] {
)
}

use codec::{Decode, Encode, /*MaxEncodedLen*/};
use frame_election_provider_support::{
onchain, ExtendedBalance, ElectionDataProvider, VoteWeight
};
use codec::{Decode, Encode};
use cp_cess_common::FRAGMENT_COUNT;
use frame_election_provider_support::{onchain, ElectionDataProvider, ExtendedBalance, VoteWeight};
pub use frame_system::Call as SystemCall;
pub use pallet_file_bank;
pub use pallet_storage_handler;
pub use pallet_oss;
use pallet_grandpa::{
fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList,
};
use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
pub use pallet_oss;
use pallet_session::historical as pallet_session_historical;
pub use pallet_storage_handler;
pub use pallet_transaction_payment::{CurrencyAdapter, Multiplier, TargetedFeeAdjustment};
use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo};
use sp_api::impl_runtime_apis;
Expand All @@ -39,36 +39,37 @@ use sp_runtime::{
generic::Era,
impl_opaque_keys,
traits::{
BlakeTwo256, Block as BlockT, Bounded, ConvertInto, Dispatchable, DispatchInfoOf, IdentifyAccount, NumberFor,
OpaqueKeys, PostDispatchInfoOf, SaturatedConversion, StaticLookup, Verify,
BlakeTwo256, Block as BlockT, Bounded, ConvertInto, DispatchInfoOf, Dispatchable,
IdentifyAccount, NumberFor, OpaqueKeys, PostDispatchInfoOf, SaturatedConversion,
StaticLookup, Verify,
},
transaction_validity::{
TransactionPriority, TransactionSource, TransactionValidity, TransactionValidityError,
},
ApplyExtrinsicResult, FixedPointNumber, MultiSignature, Perbill, Percent, Permill, Perquintill,
RuntimeAppPublic,
};
use cp_cess_common::{FRAGMENT_COUNT};
use sp_std::{marker::PhantomData, prelude::*};
pub use frame_system::Call as SystemCall;
#[cfg(feature = "std")]
use sp_version::NativeVersion;
use sp_version::RuntimeVersion;

// A few exports that help ease life for downstream crates.
pub use frame_support::{
construct_runtime,
dispatch::DispatchClass,
pallet_prelude::Get,
parameter_types,
dispatch::DispatchClass,
traits::{
AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU16, ConstU32, ConstU8, Currency,
CurrencyToVote, EitherOfDiverse, EqualPrivilegeOnly, Everything, FindAuthor, Imbalance,
InstanceFilter, KeyOwnerProofSystem, Nothing,
OnUnbalanced, Randomness, StorageInfo, U128CurrencyToVote,
InstanceFilter, KeyOwnerProofSystem, Nothing, OnUnbalanced, Randomness, StorageInfo,
U128CurrencyToVote,
},
weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND},
constants::{
BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND,
},
ConstantMultiplier, IdentityFee, Weight,
},
ConsensusEngineId, PalletId, StorageValue,
Expand All @@ -81,11 +82,7 @@ use frame_system::{

pub mod impls;
use impls::{Author, CreditToBlockAuthor, SchedulerStashAccountFinder};
// use frame_support::traits::OnRuntimeUpgrade;
// pub use pallet_file_bank::migrations::TestMigrationFileBank;
// pub use pallet_audit::migrations::MigrationSegmentBook;

pub mod constants;
use fp_rpc::TransactionStatus;
pub use pallet_balances::Call as BalancesCall;
use pallet_ethereum::{Call::transact, Transaction as EthereumTransaction};
Expand Down Expand Up @@ -274,7 +271,8 @@ parameter_types! {
const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);

/// We allow for 2 seconds of compute with a 6 second average block time.
const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_mul(2), u64::MAX);
const MAXIMUM_BLOCK_WEIGHT: Weight =
Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_mul(2), u64::MAX);

parameter_types! {
pub RuntimeBlockLength: BlockLength =
Expand Down Expand Up @@ -459,8 +457,6 @@ impl pallet_scheduler::Config for Runtime {
type WeightInfo = pallet_scheduler::weights::SubstrateWeight<Runtime>;
type OriginPrivilegeCmp = EqualPrivilegeOnly;
type Preimages = Preimage;
// type PreimageProvider = Preimage;
// type NoPreimagePostponement = NoPreimagePostponement;
}

parameter_types! {
Expand Down Expand Up @@ -770,7 +766,10 @@ pub struct OnChainVrfSloverConfig;
impl pallet_rrsc::VrfSloverConfig for OnChainVrfSloverConfig {
fn min_electable_weight() -> VoteWeight {
let total_issuance = <Runtime as pallet_cess_staking::Config>::Currency::total_issuance();
<Runtime as pallet_cess_staking::Config>::CurrencyToVote::to_vote(MIN_ELECTABLE_STAKE, total_issuance)
<Runtime as pallet_cess_staking::Config>::CurrencyToVote::to_vote(
MIN_ELECTABLE_STAKE,
total_issuance,
)
}
}

Expand Down Expand Up @@ -926,8 +925,13 @@ impl pallet_transaction_payment::Config for Runtime {
type OperationalFeeMultiplier = OperationalFeeMultiplier;
type WeightToFee = IdentityFee<Balance>;
type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;
type FeeMultiplierUpdate =
TargetedFeeAdjustment<Self, TargetBlockFullness, AdjustmentVariable, MinimumMultiplier, MaximumMultiplier>;
type FeeMultiplierUpdate = TargetedFeeAdjustment<
Self,
TargetBlockFullness,
AdjustmentVariable,
MinimumMultiplier,
MaximumMultiplier,
>;
}

impl pallet_sudo::Config for Runtime {
Expand Down Expand Up @@ -1125,7 +1129,10 @@ where
public: <Signature as sp_runtime::traits::Verify>::Signer,
account: AccountId,
nonce: Index,
) -> Option<(RuntimeCall, <UncheckedExtrinsic as sp_runtime::traits::Extrinsic>::SignaturePayload)> {
) -> Option<(
RuntimeCall,
<UncheckedExtrinsic as sp_runtime::traits::Extrinsic>::SignaturePayload,
)> {
let tip = 0;
// take the biggest period possible.
let period =
Expand Down Expand Up @@ -1409,7 +1416,7 @@ impl fp_self_contained::SelfContainedCall for RuntimeCall {
}

fn validate_self_contained(
&self,
&self,
info: &Self::SignedInfo,
dispatch_info: &DispatchInfoOf<RuntimeCall>,
len: usize,
Expand All @@ -1420,15 +1427,15 @@ impl fp_self_contained::SelfContainedCall for RuntimeCall {
}
}


fn pre_dispatch_self_contained(
&self,
info: &Self::SignedInfo,
dispatch_info: &DispatchInfoOf<RuntimeCall>,
len: usize,
) -> Option<Result<(), TransactionValidityError>> {
match self {
RuntimeCall::Ethereum(call) => call.pre_dispatch_self_contained(info, dispatch_info, len),
RuntimeCall::Ethereum(call) =>
call.pre_dispatch_self_contained(info, dispatch_info, len),
_ => None,
}
}
Expand All @@ -1438,9 +1445,10 @@ impl fp_self_contained::SelfContainedCall for RuntimeCall {
info: Self::SignedInfo,
) -> Option<sp_runtime::DispatchResultWithInfo<PostDispatchInfoOf<Self>>> {
match self {
call @ RuntimeCall::Ethereum(pallet_ethereum::Call::transact { .. }) => Some(
call.dispatch(RuntimeOrigin::from(pallet_ethereum::RawOrigin::EthereumTransaction(info))),
),
call @ RuntimeCall::Ethereum(pallet_ethereum::Call::transact { .. }) =>
Some(call.dispatch(RuntimeOrigin::from(
pallet_ethereum::RawOrigin::EthereumTransaction(info),
))),
_ => None,
}
}
Expand Down Expand Up @@ -1565,7 +1573,8 @@ pub type SignedExtra = (
pub type UncheckedExtrinsic =
fp_self_contained::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
/// Extrinsic type that has already been checked.
pub type CheckedExtrinsic = fp_self_contained::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra, H160>;
pub type CheckedExtrinsic =
fp_self_contained::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra, H160>;
/// The payload being signed in transactions.
pub type SignedPayload = generic::SignedPayload<RuntimeCall, SignedExtra>;
// Executive: handles dispatch to the various modules.
Expand Down
Loading