v0.17.18: Update latest substrate (#776)

* update latest substrate polkadot-master

* fix test compilation

* bump version to 0.7.18

* bump impl_version

* update substrate

* Revert "Instantiate environment with asynchronous API (#768)"

This reverts commit a5d9645bf4.

* update substrate

* remove unused parameter type

* bump trie-db version for tests

* fix collator test

* update substrate

* remove unnecessary service changes

polkadot/network/src/tests/validation.rs

@@ -35,7 +35,8 @@ use polkadot_primitives::parachain::{
 use parking_lot::Mutex;
 use sp_blockchain::Result as ClientResult;
 use sp_api::{ApiRef, Core, RuntimeVersion, StorageProof, ApiErrorExt, ApiExt, ProvideRuntimeApi};
-use sp_runtime::traits::Block as BlockT;
+use sp_runtime::traits::{Block as BlockT, HasherFor, NumberFor};
+use sp_state_machine::ChangesTrieState;
 
 use std::collections::HashMap;
 use std::sync::Arc;
@@ -225,12 +226,10 @@ impl ApiExt<Block> for RuntimeApi {
 		None
 	}
 
-	fn into_storage_changes<
-		T: sp_api::ChangesTrieStorage<sp_api::HasherFor<Block>, sp_api::NumberFor<Block>>
-	>(
+	fn into_storage_changes(
 		&self,
 		_: &Self::StateBackend,
-		_: Option<&T>,
+		_: Option<&ChangesTrieState<HasherFor<Block>, NumberFor<Block>>>,
 		_: <Block as sp_api::BlockT>::Hash,
 	) -> std::result::Result<sp_api::StorageChanges<Self::StateBackend, Block>, String>
 		where Self: Sized