This repository has been archived by the owner on Nov 15, 2023. It is now read-only.
Instantiate environment with asynchronous API #768
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…h-environment-async
rphmeier
added
A0-please_review
NikVolf
reviewed
Jan 16, 2020
| @@ -77,7 +77,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { | |||
| spec_name: create_runtime_str!("kusama"), | |||
| impl_name: create_runtime_str!("parity-kusama"), | |||
| authoring_version: 2, | |||
| spec_version: 1040, | |||
| spec_version: 1041, | |||
There was a problem hiding this comment.
It might not be needed, CI have me an error before though.
mxinden
reviewed
Jan 16, 2020
| @@ -569,23 +569,24 @@ impl<C, N, P, SC, TxPool, B> consensus::Environment<Block> for ProposerFactory<C | |||
| // Rust bug: https://github.com/rust-lang/rust/issues/24159 | |||
| sp_api::StateBackendFor<P, Block>: sp_api::StateBackend<HasherFor<Block>> + Send, | |||
| { | |||
| type CreateProposer = Pin<Box< | |||
There was a problem hiding this comment.
Is it necessary for this to be Pin? In case the future is Unpin I would suggest pinning on polling.
There was a problem hiding this comment.
I guess not - I'll avoid pinning in the follow-up if possible.
mxinden
reviewed
Jan 16, 2020
| @@ -569,23 +569,24 @@ impl<C, N, P, SC, TxPool, B> consensus::Environment<Block> for ProposerFactory<C | |||
| // Rust bug: https://github.com/rust-lang/rust/issues/24159 | |||
| sp_api::StateBackendFor<P, Block>: sp_api::StateBackend<HasherFor<Block>> + Send, | |||
| { | |||
| type CreateProposer = Pin<Box< | |||
There was a problem hiding this comment.
The following compiles for me:
diff --git a/validation/src/lib.rs b/validation/src/lib.rs
index 860c1a6f..51f09700 100644
--- a/validation/src/lib.rs
+++ b/validation/src/lib.rs
@@ -569,9 +569,7 @@ impl<C, N, P, SC, TxPool, B> consensus::Environment<Block> for ProposerFactory<C
// Rust bug: https://github.com/rust-lang/rust/issues/24159
sp_api::StateBackendFor<P, Block>: sp_api::StateBackend<HasherFor<Block>> + Send,
{
- type CreateProposer = Pin<Box<
- dyn Future<Output = Result<Self::Proposer, Self::Error>> + Send + Unpin + 'static
- >>;
+ type CreateProposer = futures::future::Ready<Result<Self::Proposer, Self::Error>>;
type Proposer = Proposer<P, TxPool, B>;
type Error = Error;
@@ -597,7 +595,7 @@ impl<C, N, P, SC, TxPool, B> consensus::Environment<Block> for ProposerFactory<C
backend: self.backend.clone(),
});
- Box::pin(future::ready(maybe_proposer))
+ future::ready(maybe_proposer)
}
}
|
A follow up pull request in regards to my suggestion is fine. |
andresilva
added a commit
that referenced
this pull request
Jan 17, 2020
This reverts commit 989db4b.
andresilva
added a commit
that referenced
this pull request
Jan 17, 2020
* 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 989db4b. * update substrate * remove unused parameter type * bump trie-db version for tests * fix collator test * update substrate * remove unnecessary service changes
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
tiny patch for paritytech/substrate#4630