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

Remove legacy secrets support #10865

Merged
merged 18 commits into from
Oct 11, 2023
Merged

Conversation

KuphJr
Copy link
Contributor

@KuphJr KuphJr commented Oct 4, 2023

No description provided.

@KuphJr KuphJr requested a review from bolekk October 4, 2023 21:22
@github-actions
Copy link
Contributor

github-actions bot commented Oct 4, 2023

I see that you haven't updated any README files. Would it make sense to do so?

@github-actions
Copy link
Contributor

github-actions bot commented Oct 4, 2023

I see that you haven't updated any CHANGELOG files. Would it make sense to do so?

Data *computationData `json:"data"`
}

type computationData struct {
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we add omitempty to Secrets field in RequestData instead of creating a copy of the same struct?

@@ -13,7 +13,7 @@ import (
var (
// a batch of 8 max-length results uses around 2M gas (assuming 70k gas per client callback - see FunctionsClientExample.sol)
nOracleNodes = 4
nClients = 50
nClients = 1
Copy link
Contributor

Choose a reason for hiding this comment

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

?

@@ -27,33 +27,6 @@ func TestIntegration_Functions_MultipleV1Requests_Success(t *testing.T) {

utils.SetupRouterRoutes(t, b, owner, routerContract, active.Address, proposed.Address, allowListContractAddress)

_, _, oracleIdentities := utils.CreateFunctionsNodes(t, owner, b, routerAddress, nOracleNodes, maxGas, nil, nil)
Copy link
Contributor

Choose a reason for hiding this comment

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

Why are you removing this? Can't we keep it with empty secrets?

@KuphJr KuphJr requested a review from bolekk October 9, 2023 18:58
require.Equal(t, functions.LocationRemote, int(data["secretsLocation"].(float64)))
if data["secrets"] != DefaultSecretsBase64 && request["nodeProvidedSecrets"] != fmt.Sprintf(`{"0x0":"%s"}`, DefaultSecretsBase64) {
assert.Fail(t, "expected secrets or nodeProvidedSecrets to be '%s'", DefaultSecretsBase64)
if data["secrets"] != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

"secrets" will always be nil now, right? Did you mean to check "nodeProvidedSecrets" here?

@KuphJr KuphJr enabled auto-merge October 11, 2023 20:34
@cl-sonarqube-production
Copy link

@KuphJr KuphJr added this pull request to the merge queue Oct 11, 2023
Merged via the queue into develop with commit 838d162 Oct 11, 2023
83 checks passed
@KuphJr KuphJr deleted the chore/remove-legacy-secrets-support branch October 11, 2023 21:18
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