Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cherry-pick late release/v13 commits onto master #1554

Merged
merged 2 commits into from
Jun 21, 2024
Merged

Conversation

rvagg
Copy link
Member

@rvagg rvagg commented Jun 19, 2024

These two were late to nv22 and were only merged into the release/v13 branch so are missing from master. I suppose we should have a master-first policy to prevent this!

The events assertion in integration tests have become optional since then so these commits didn't quite cleanly apply.

aarshkshah1992 and others added 2 commits June 19, 2024 13:32
* update to Actor events

* changes as per review

* remvoe clippy

* changes as per new FIP update

* Update to latest PR, remove emit:: use from testing

* all itests passing and green CI

* address review feedback, minimise diff

* feat: add term_start to claim events

* fix: claim term_start at current epoch, not at deal_start

* fix: s/deal_term/claim_term

---------

Co-authored-by: Rod Vagg <rod@vagg.org>
* update to Actor events

* changes as per review

* remvoe clippy

* changes as per new FIP update

* Update to latest PR, remove emit:: use from testing

* all itests passing and green CI

* address review feedback, minimise diff

* feat: add term_start to claim events

* fix: claim term_start at current epoch, not at deal_start

* fix: s/deal_term/claim_term

* add client to verifier balance event

* fix: make "client" optional on verifier-balance event

---------

Co-authored-by: Rod Vagg <rod@vagg.org>
@rvagg rvagg force-pushed the rvagg/v13-changes branch from 79aa1ad to 1013924 Compare June 19, 2024 03:32
@anorth
Copy link
Member

anorth commented Jun 20, 2024

I suppose we should have a master-first policy to prevent this!

Yes we should! But how to enforce it...

@rvagg rvagg added this pull request to the merge queue Jun 21, 2024
Merged via the queue into master with commit 1d8f082 Jun 21, 2024
14 checks passed
@rvagg rvagg deleted the rvagg/v13-changes branch June 21, 2024 01:29
ZenGround0 pushed a commit that referenced this pull request Jun 25, 2024
* Updates to Actor events based on community feedback for NV22  (#1531)

* update to Actor events

* changes as per review

* remvoe clippy

* changes as per new FIP update

* Update to latest PR, remove emit:: use from testing

* all itests passing and green CI

* address review feedback, minimise diff

* feat: add term_start to claim events

* fix: claim term_start at current epoch, not at deal_start

* fix: s/deal_term/claim_term

---------

Co-authored-by: Rod Vagg <rod@vagg.org>

* Add client to verifier balance event (#1533)

* update to Actor events

* changes as per review

* remvoe clippy

* changes as per new FIP update

* Update to latest PR, remove emit:: use from testing

* all itests passing and green CI

* address review feedback, minimise diff

* feat: add term_start to claim events

* fix: claim term_start at current epoch, not at deal_start

* fix: s/deal_term/claim_term

* add client to verifier balance event

* fix: make "client" optional on verifier-balance event

---------

Co-authored-by: Rod Vagg <rod@vagg.org>

---------

Co-authored-by: Aarsh Shah <aarshkshah1992@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants