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

Migrate pallet-insecure-randomness-collective-flip to umbrella crate #6738

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+26 −29
Draft

Migrate pallet-insecure-randomness-collective-flip to umbrella crate #6738

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
05e458b
import umbrella crate
FereMouSiopi Dec 3, 2024
37439a2
Merge branch 'master' into umbrella-ircf
FereMouSiopi Dec 3, 2024
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
6 changes: 1 addition & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 3 additions & 15 deletions substrate/frame/insecure-randomness-collective-flip/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,16 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { features = ["derive"], workspace = true }
safe-mix = { workspace = true }
scale-info = { features = ["derive"], workspace = true }
frame-support = { workspace = true }
frame-system = { workspace = true }
sp-runtime = { workspace = true }

[dev-dependencies]
sp-core = { workspace = true, default-features = true }
sp-io = { workspace = true, default-features = true }
frame = { workspace = true, features = ["experimental", "runtime"] }

[features]
default = ["std"]
std = [
"codec/std",
"frame-support/std",
"frame-system/std",
"frame/std",
"safe-mix/std",
"scale-info/std",
"sp-core/std",
"sp-io/std",
"sp-runtime/std",
]
try-runtime = [
"frame-support/try-runtime",
"frame-system/try-runtime",
"sp-runtime/try-runtime",
"frame/try-runtime",
]
31 changes: 22 additions & 9 deletions substrate/frame/insecure-randomness-collective-flip/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,11 @@
//! ### Example - Get random seed for the current block
//!
//! ```
//! use frame_support::traits::Randomness;
//! use frame::{prelude::*, traits::Randomness};
//!
//! #[frame_support::pallet]
//! #[frame::pallet]
//! pub mod pallet {
//! use super::*;
//! use frame_support::pallet_prelude::*;
//! use frame_system::pallet_prelude::*;
//!
//! #[pallet::pallet]
//! pub struct Pallet<T>(_);
Expand All @@ -73,10 +71,15 @@
use safe_mix::TripletMix;

use codec::Encode;
/*
use frame_support::{pallet_prelude::Weight, traits::Randomness};
use frame_system::pallet_prelude::BlockNumberFor;
use sp_runtime::traits::{Hash, Saturating};

*/
use frame::{
prelude::*,
traits::{Hash, Randomness, Saturating},
};
const RANDOM_MATERIAL_LEN: u32 = 81;

fn block_number_to_index<T: Config>(block_number: BlockNumberFor<T>) -> usize {
Expand All @@ -87,10 +90,10 @@ fn block_number_to_index<T: Config>(block_number: BlockNumberFor<T>) -> usize {

pub use pallet::*;

#[frame_support::pallet]
#[frame::pallet]
pub mod pallet {
use super::*;
use frame_support::pallet_prelude::*;
//use frame_support::pallet_prelude::*;

#[pallet::pallet]
pub struct Pallet<T>(_);
Expand Down Expand Up @@ -167,7 +170,16 @@ impl<T: Config> Randomness<T::Hash, BlockNumberFor<T>> for Pallet<T> {
mod tests {
use super::*;
use crate as pallet_insecure_randomness_collective_flip;
use frame::{
runtime::{
prelude::{construct_runtime, derive_impl, parameter_types},
testing_prelude::BuildStorage,
},
testing_prelude::frame_system::limits,
traits::{Header, Randomness},
};

/*
use sp_core::H256;
use sp_runtime::{traits::Header as _, BuildStorage};

Expand All @@ -176,10 +188,11 @@ mod tests {
traits::{OnInitialize, Randomness},
};
use frame_system::limits;
*/

type Block = frame_system::mocking::MockBlock<Test>;

frame_support::construct_runtime!(
construct_runtime!(
pub enum Test
{
System: frame_system,
Expand All @@ -199,7 +212,7 @@ mod tests {

impl pallet_insecure_randomness_collective_flip::Config for Test {}

fn new_test_ext() -> sp_io::TestExternalities {
fn new_test_ext() -> frame::deps::sp_io::TestExternalities {
let t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
t.into()
}
Expand Down