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.

Sign up for GitHub

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

Jump to bottom

replace instant with web-time #5800

Merged
merged 2 commits into from
May 30, 2024
Merged

replace instant with web-time #5800

merged 2 commits into from
May 30, 2024

Conversation

jxs
Copy link
Member

@jxs jxs commented May 16, 2024

instant has been abandoned, see sebcrozet/instant#52 (comment)

@jxs jxs changed the base branch from stable to unstable May 16, 2024 22:29
@jxs jxs force-pushed the replace-instant-gossipsub branch from f5ebefe to 8cca644 Compare May 16, 2024 22:30
@jxs jxs force-pushed the replace-instant-gossipsub branch from 8cca644 to 90fc417 Compare May 16, 2024 22:34
@jxs jxs requested review from AgeManning and ackintosh May 22, 2024 13:36
ackintosh
ackintosh approved these changes May 22, 2024
View reviewed changes
Copy link
Member

@ackintosh ackintosh left a comment

Choose a reason for hiding this comment

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

LGTM!

@jxs
Copy link
Member Author

jxs commented May 23, 2024

@Mergifyio queue

@mergify Mergify
Copy link

mergify bot commented May 23, 2024 •
edited

queue

🛑 The pull request has been removed from the queue default

The pull request conflicts with at least one pull request ahead in queue.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

pawanjay176
pawanjay176 approved these changes May 27, 2024
View reviewed changes
Copy link
Member

@pawanjay176 pawanjay176 left a comment

Choose a reason for hiding this comment

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

Just noting here that web-time simply re-exports std::time for non wasm targets so we aren't using any specialized implementations of Instant in Lighthouse, so no heartbeat issues can arise from this.

@jxs
Copy link
Member Author

jxs commented May 27, 2024

@Mergifyio queue

@mergify Mergify
Copy link

mergify bot commented May 27, 2024

queue

🛑 The pull request has been removed from the queue default

The pull request conflicts with at least one pull request ahead in queue.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

@jimmygchen jimmygchen added ready-for-merge This PR is ready to merge. dependencies Pull requests that update a dependency file labels May 29, 2024
@jimmygchen
Merge branch 'unstable' into replace-instant-gossipsub
3bce62f 
# Conflicts:
#	Cargo.lock
#	beacon_node/lighthouse_network/Cargo.toml
@realbigsean
Copy link
Member

@mergify queue

@mergify Mergify
Copy link

mergify bot commented May 30, 2024 •
edited

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at bbe9242

mergify bot added a commit that referenced this pull request May 30, 2024
@mergify
Merge of #5800
5bddcff
@mergify mergify bot mentioned this pull request May 30, 2024
Closed
5 tasks
@mergify mergify bot merged commit bbe9242 into sigp:unstable May 30, 2024
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ackintosh ackintosh ackintosh approved these changes

@pawanjay176 pawanjay176 pawanjay176 approved these changes

@AgeManning AgeManning Awaiting requested review from AgeManning

Assignees
No one assigned
Labels
dependencies Pull requests that update a dependency file ready-for-merge This PR is ready to merge.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jxs @realbigsean @ackintosh @pawanjay176 @jimmygchen