Skip to content

chore: merge conflicts#14722

Merged
alexghr merged 3 commits intonextfrom
ag/fix-next
Jun 3, 2025
Merged

chore: merge conflicts#14722
alexghr merged 3 commits intonextfrom
ag/fix-next

Conversation

@alexghr
Copy link
Contributor

@alexghr alexghr commented Jun 3, 2025

Restore code from #14689

@alexghr alexghr enabled auto-merge June 3, 2025 13:03
MirandaWood added a commit that referenced this pull request Jun 3, 2025
expect(p2pClient.getTxsByHash).toHaveBeenCalledWith(proposal.payload.txHashes, sender);
});

it('should request txs even if not attestor in this slot', async () => {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Duplicate test (see line 247 of same file)

expect(p2pClient.getTxsByHash).toHaveBeenCalledWith(proposal.payload.txHashes, sender);
});

it('should request txs if missing for attesting', async () => {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Duplicate test (see line 239 of same file)

@alexghr alexghr added this pull request to the merge queue Jun 3, 2025
Merged via the queue into next with commit 8adab31 Jun 3, 2025
4 checks passed
@alexghr alexghr deleted the ag/fix-next branch June 3, 2025 16:17
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.

2 participants