fix node build

Author: Joshua Mir

datdot-node/node/Cargo.toml

@@ -15,10 +15,10 @@ path = "src/main.rs"
 
 [dependencies]
 derive_more = "0.15.0"
-futures = "0.3.1"
-structopt = "0.3.8"
+futures = "0.3.5"
+structopt = "0.3.15"
 futures01 = { package = "futures", version = "0.1.29" }
-ctrlc = { version = "3.1.3", features = ["termination"] }
+ctrlc = { version = "3.1.4", features = ["termination"] }
 log = "0.4.8"
 tokio = "0.1.22"
 exit-future = "0.2.0"

datdot-node/node/src/service.rs

@@ -69,7 +69,7 @@ pub fn new_full(config: Configuration) -> Result<impl AbstractService, ServiceEr
 		.map_err(sp_consensus::error::Error::InherentData)?;
 
 	let builder = new_full_start!(config);
-	let service = builder.build()?;
+	let service = builder.build_full()?;
 
 	// Initialize seed for signing transaction using off-chain workers
 	#[cfg(feature = "ocw")]
@@ -153,5 +153,5 @@ pub fn new_light(config: Configuration) -> Result<impl AbstractService, ServiceE
 			},
 		)?
 		.with_finality_proof_provider(|_client, _backend| Ok(Arc::new(()) as _))?
-		.build()
+		.build_light()
 }

datdot-node/pallets/datdot/src/lib.rs

@@ -96,8 +96,6 @@ pub trait Trait: system::Trait{
 	MaybeSerializeDeserialize + Debug;
 	type AttestationId: Parameter + Member + AtLeast32Bit + BaseArithmetic + EncodeLike<u32> + Codec + Default + Copy +
 	MaybeSerializeDeserialize + Debug;
-	type ChunkIndex: Parameter + Member + AtLeast32Bit + BaseArithmetic + EncodeLike<u32> + Codec + Default + Copy +
-	MaybeSerializeDeserialize + Debug;
 	// ---
 }
 
@@ -112,7 +110,6 @@ decl_event!(
 	<T as Trait>::ContractId,
 	<T as Trait>::PlanId,
 	<T as Trait>::ChallengeId,
-	<T as Trait>::ChunkIndex
 	{
 		/// New data feed registered
 		NewFeed(FeedId),
@@ -139,6 +136,7 @@ decl_event!(
 );
 
 type RoleValue = Option<u32>;
+type ChunkIndex = u64;
 
 #[derive(Decode, PartialEq, Eq, Encode, Clone, RuntimeDebug)]
 enum Role {
@@ -192,14 +190,14 @@ struct Plan<T: Trait> {
 	id: T::PlanId,
 	feed: T::FeedId,
 	publisher: T::UserId,
-	ranges: Ranges<T::ChunkIndex>
+	ranges: Ranges<ChunkIndex>
 }
 
 #[derive(Decode, PartialEq, Eq, Encode, Clone, Default, RuntimeDebug)]
 struct Contract<T: Trait> {
 	id: T::ContractId,
 	plan: T::PlanId,
-	ranges: Ranges<T::ChunkIndex>,
+	ranges: Ranges<ChunkIndex>,
 	encoder: T::UserId,
 	hoster: T::UserId
 }
@@ -208,7 +206,7 @@ struct Contract<T: Trait> {
 struct Challenge<T: Trait> {
 	id: T::ChallengeId,
 	contract: T::ContractId,
-	chunks: Vec<T::ChunkIndex>
+	chunks: Vec<ChunkIndex>
 }
 
 
@@ -430,7 +428,7 @@ decl_module!{
 		}
 
 		#[weight = (100000, Operational, Pays::No)] //todo weight
-		fn publish_feed_and_plan(origin, merkle_root: (Public, TreeHashPayload, H512), ranges: Ranges<T::ChunkIndex>){
+		fn publish_feed_and_plan(origin, merkle_root: (Public, TreeHashPayload, H512), ranges: Ranges<ChunkIndex>){
 			let user_address = ensure_signed(origin)?;
 			if let Some(user_id) = <GetIDByUser<T>>::get(&user_address){
 				let mut feed_id : T::FeedId;
@@ -654,7 +652,7 @@ impl<T: Trait> Module<T> {
 		}
 	}
 
-	fn random_from_ranges(ranges: Ranges<T::ChunkIndex>) -> Vec<T::ChunkIndex>{
+	fn random_from_ranges(ranges: Ranges<ChunkIndex>) -> Vec<ChunkIndex>{
 		//TODO, currently only returns first chunk of every available range,
 		//should return some random selection.
 		ranges.iter().map(|x|x.0).collect()

datdot-node/runtime/src/lib.rs

@@ -183,6 +183,7 @@ impl system::Trait for Runtime {
 	type OnKilledAccount = ();
 	/// The data to be stored in an account.
 	type AccountData = balances::AccountData<Balance>;
+	type BaseCallFilter = ();
 }
 
 parameter_types! {
@@ -239,17 +240,18 @@ parameter_types! {
 	pub const ChallengeDelay: u32 = 5;
 }
 
+type DatDotIdType = u32;
+
 impl dat_verify::Trait for Runtime {
 	type Event = Event;
 	type Hash = Hash;
 	type Randomness = RandomnessCollectiveFlip;
-	type ForceOrigin = dat_verify::EnsureSeeder<Runtime>;
-	type AttestorsPerChallenge = AttestorsPerChallenge;
-	type MinEncodersPerHoster = MinEncodersPerHoster;
-	type MinHostersPerArchive = MinHostersPerArchive;
-	type ChallengeDelay = ChallengeDelay;
-	type Proposal = Call;
-	type Scheduler = Scheduler;
+	type FeedId = DatDotIdType;
+	type UserId = DatDotIdType;
+	type ContractId = DatDotIdType;
+	type ChallengeId = DatDotIdType;
+	type PlanId = DatDotIdType;
+	type AttestationId = DatDotIdType;
 
 }