Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Conversation

@expenses
Copy link
Contributor

This is an updated branch of #3909.

@expenses
Copy link
Contributor Author

@rphmeier
Copy link
Contributor

@expenses Do you have a PR ready to go? Differences from paritytech/finality-grandpa#100 ?

@expenses
Copy link
Contributor Author

expenses commented Jan 14, 2020

@rphmeier See paritytech/finality-grandpa#104

@expenses expenses added the A3-in_progress Pull request is in progress. No review needed at this stage. label Jan 14, 2020
Copy link
Contributor

@tomaka tomaka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after the nit with map

@expenses expenses requested a review from tomaka January 16, 2020 16:56
@expenses
Copy link
Contributor Author

We should probably field test this PR pretty heavily.

@expenses
Copy link
Contributor Author

@andresilva @rphmeier suggested I ping you for ideas on how to test this.

@andresilva
Copy link
Contributor

andresilva commented Jan 17, 2020

@expenses https://gist.github.com/andresilva/264e00476f125d3bd6716fb58478d543 have a look at these instructions for setting up a local testnet, feel free to dm me on riot if you have any issues. Ideally, we should also build and deploy polkadot with these changes on one of our validators to do some field testing, coordinating with @ddorgan (we might have to wait a bit for this due to the issues with latest libp2p version).

@expenses expenses requested a review from tomaka January 17, 2020 18:04
@expenses
Copy link
Contributor Author

@andresilva I don't have the hardware to run the dockerised local testnet right now, but perhaps we could fieldtest with @ddorgan?

@andresilva
Copy link
Contributor

I guess we could deploy some validators on flaming fir (or spin up some temporary testnet) with these changes? cc @ddorgan

@expenses expenses removed the A3-in_progress Pull request is in progress. No review needed at this stage. label Jan 22, 2020
@expenses
Copy link
Contributor Author

@ddorgan updated the flaming fir nodes, and things seem to be going alright. I'm not the best at reading logs though. @rphmeier maybe you could just check that things are going smoothly if you're not too busy?

Copy link
Contributor

@mxinden mxinden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for all the effort here.

I have a couple of questions and comments. None of them are important enough to block this pull request.

target_hash: block_30_hash,
};

Pin::new(&mut *round_tx.lock()).start_send(finality_grandpa::Message::Prevote(prevote)).unwrap();
Copy link
Contributor

@mxinden mxinden Jan 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One should first call poll_ready before start_send on Sink. As a convenience function, given that we are within an async block, one can call SinkExt::send.

(I don't think this was introduced through this pull request, but the pull request enables the easy fix via SinkExt::send. Let me know if you want me to do this as a follow up.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We actually can't use SinkExt::send, because that's that'd mean awaiting a function that borrows a mutex and ends up with: *mut () cannot be sent between threads safely.

@rphmeier
Copy link
Contributor

@rphmeier maybe you could just check that things are going smoothly if you're not too busy?

Seems to be finalizing 1 day later!

@andresilva
Copy link
Contributor

Flaming fir was having some issues when running nodes without this PR anyway, so I think it's probably unrelated (it's still running the libp2p version that we had issues with). I'm OK with not blocking this PR further, when we start using this in polkadot we can do some prior testing on our nodes as well. I'll give this a final review in a bit.

Copy link
Contributor

@andresilva andresilva left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm. minor nits.

@expenses
Copy link
Contributor Author

Ok. If we're all happy with merging this PR, I'll do that in a few hours.

@expenses expenses merged commit fca8058 into master Jan 24, 2020
@expenses expenses deleted the ashley-grandpa-futures branch January 24, 2020 12:34
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants