Update polkadot & substrate (#76)

cumulus/runtime/src/validate_block/implementation.rs

@@ -28,7 +28,7 @@ use hash_db::{HashDB, EMPTY_PREFIX};
 
 use trie_db::{Trie, TrieDB};
 
-use parachain::{ValidationParams, ValidationResult};
+use parachain::primitives::{HeadData, ValidationParams, ValidationResult};
 
 use codec::{Decode, Encode};
 
@@ -73,12 +73,12 @@ trait Storage {
 /// Validate a given parachain block on a validator.
 #[doc(hidden)]
 pub fn validate_block<B: BlockT, E: ExecuteBlock<B>>(params: ValidationParams) -> ValidationResult {
-	let block_data = crate::ParachainBlockData::<B>::decode(&mut &params.block_data[..])
+	let block_data = crate::ParachainBlockData::<B>::decode(&mut &params.block_data.0[..])
 		.expect("Invalid parachain block data");
 
-	let parent_head = B::Header::decode(&mut &params.parent_head[..]).expect("Invalid parent head");
+	let parent_head = B::Header::decode(&mut &params.parent_head.0[..]).expect("Invalid parent head");
 	// TODO: Use correct head data
-	let head_data = block_data.header.encode();
+	let head_data = HeadData(block_data.header.encode());
 
 	// TODO: Add `PolkadotInherent`.
 	let block = B::new(block_data.header, block_data.extrinsics);
@@ -110,7 +110,10 @@ pub fn validate_block<B: BlockT, E: ExecuteBlock<B>>(params: ValidationParams) -
 
 	E::execute_block(block);
 
-	ValidationResult { head_data }
+	ValidationResult {
+		head_data,
+		new_validation_code: None,
+	}
 }
 
 /// The storage implementation used when validating a block that is using the

cumulus/runtime/src/validate_block/tests.rs

@@ -16,7 +16,7 @@
 
 use crate::{ParachainBlockData, WitnessData};
 
-use parachain::{ValidationParams, ValidationResult};
+use parachain::primitives::{BlockData, HeadData, ValidationParams, ValidationResult};
 use sc_executor::{
 	error::Result, WasmExecutionMethod, WasmExecutor, sp_wasm_interface::HostFunctions,
 };
@@ -44,8 +44,12 @@ fn call_validate_block(
 	let mut ext = TestExternalities::default();
 	let mut ext_ext = ext.ext();
 	let params = ValidationParams {
-		block_data: block_data.encode(),
-		parent_head: parent_head.encode(),
+		block_data: BlockData(block_data.encode()),
+		parent_head: HeadData(parent_head.encode()),
+		code_upgrade_allowed: None,
+		max_code_size: 1024,
+		max_head_data_size: 1024,
+		relay_chain_height: 1,
 	}
 	.encode();
 
@@ -65,7 +69,7 @@ fn call_validate_block(
 		&mut ext_ext,
 	)
 	.map(|v| ValidationResult::decode(&mut &v[..]).expect("Decode `ValidationResult`."))
-	.map(|v| Header::decode(&mut &v.head_data[..]).expect("Decode `Header`."))
+	.map(|v| Header::decode(&mut &v.head_data.0[..]).expect("Decode `Header`."))
 	.map_err(|err| err.into())
 }