search

livepeer / protocol

Livepeer protocol
MIT License
154 stars 45 forks source link

Resolve merge conflicts in next #462

Closed kyriediculous closed 3 years ago

kyriediculous commented 3 years ago

What does this pull request do? Explain your changes. (required) Merge next into streamflow. This branch resolves a merge conflict between streamflow and next

coveralls commented 3 years ago

Pull Request Test Coverage Report for Build 1144953044

Totals Coverage Status
Change from base Build 1137227852: 1.0%
Covered Lines: 859
Relevant Lines: 865
💛 - Coveralls
kyriediculous commented 3 years ago

I think coverage is down because the refunder test is removed but the contract is still present , shall I add a commit to remove the refunder ? I mean it wasn't being used in streamflow either.

yondonfu commented 3 years ago

This branch resolves a merge conflict between streamflow and next

Would an alternative have been to cherry pick the conflicting commit (I think this one) into next right before the recent hardhat/TS/yarn related commits so that next could be cleanly merged into streamflow by sharing the same Git history prior to the recent hardhat/TS/yarn related commits?

I think coverage is down because the refunder test is removed but the contract is still present , shall I add a commit to remove the refunder ? I mean it wasn't being used in streamflow either.

The Refunder contract is a part of the the contract system on mainnet right now (ref) since it was used to refund deposits from the pre-Streamflow JobsManager contract during the Streamflow upgrade. I'd be inclined to leave it for now so that the state of the streamflow branch can continue to reflect what is deployed on mainnet - would it be possible to add back the test for the Refunder contract?

kyriediculous commented 3 years ago

next branch is protected , you can not force push to it so cherry picking is not an option AFAIK

yondonfu commented 3 years ago

next branch is protected , you can not force push to it so cherry picking is not an option AFAIK

What about merging your nv/next branch (which presumably was rebased off of streamflow with the conflicts resolved) into next via PR to line up the history on next with streamflow and then merge next into streamflow via PR?

kyriediculous commented 3 years ago

I changed the base to next, I'll look at the refunder test

kyriediculous commented 3 years ago

@kautukkundan will add the refunder test in a separate PR

kyriediculous commented 3 years ago

Resolved merge conflicts