Fix broken temp-v0.10.0 branch merge #1522
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Remove constants test * Fix flaky test One of the unsafe evaluate test is flaky because the setInterval used internally might be potentially be called 4 times until the evaluation is suspended by the node VM. This fix is to change the tick period to make this even less probable. * Use API_CALL_TIMEOUT constant in tests * Remove API_CALL_TOTAL_TIMEOUT * Add worker timeout test * Refactor airnode-utilities timeouts * Rename default timeout to default blockchain call timeout * Add changeset * Fix lint * Remove unused delay configuration for deployer handlers
Remove heartbeatId
* Add heartbeat signing * Add changeset * Use timestamp in heartbeat signature
* Add heartbeat signing * Add changeset * Use timestamp in heartbeat signature * Add airnode_address, cloud_provider, stage, region to heartbeat payload * Add changeset * Remove airnode_address from heartbeat payload * Fix martin github account
…1418) * Remove gateway keys from validator and configs * Remove gateway keys from local handlers, examples, request headers, gcp verification * Add gateway path_key uuid to deployer, terraform and openapi templates * Add pathKey to local gateway server * Remove unused path_key variable from terraform, add uuid to local gateway docs, fix example secrets file, fix openApi template paths * Increase npm registry ping delay * Fix GCP gateway output url * Generate gateway uuid with terraform random_uuid * Uuse constant pathKey in local gateways * Merge branch temp-v0.10.0 into remove-gateway-api-keys * Update local gateway pathKey constant
Siegrift
force-pushed
the
fix-0.10-merge
branch
from
ac3fe05
to
f924cf9
Compare
amarthadan
approved these changes
Nov 8, 2022
Yeah, we should do that. The heartbeat will be tested by @andreogle, but we should re-test the gateways. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #1521
What happened
See #1521 (comment). Apart from the force push (which removed heartbeat signature, heartbeat data and shift from gateway API keys) two other features got lost (avoiding constants with side effects, heartbeat ID removal).
The fix
I listed all PRs which were merged into
temp-v0.10.0branch and sorted them. This can be seen here. The sorting is approximate, since GH doesn't have a sort function based on merged date.I checked what was actually merged when we merged the
temp-v0.10.0branch back tomaster. This can be seen here. As mentioned everything merged after #1434 was added to master.To include all of the merged PRs before #1434, I determined the order in which they were merged and cherry-picked them one by one. There were minimal merge conflicts since Airnode hasn't changed much.
Sorry, for the trouble I caused.