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

Remove Explorer #10581

Merged
merged 16 commits into from
Sep 14, 2023
Merged

Remove Explorer #10581

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3a27219
Remove the Explorer client
skubakdj Sep 11, 2023
4953e55
Remove Explorer config
skubakdj Sep 11, 2023
3736612
Update mocks
skubakdj Sep 11, 2023
0e6b260
Update changelog
skubakdj Sep 11, 2023
0ebe982
Remove additional `ExplorerURL` references
skubakdj Sep 11, 2023
9b69595
Generate docs
skubakdj Sep 11, 2023
3856a7d
Merge branch 'develop' into chore/remove-explorer
skubakdj Sep 11, 2023
37267fe
Merge branch 'develop' into chore/remove-explorer
skubakdj Sep 11, 2023
faed1cd
Specify removed config in changelog
skubakdj Sep 13, 2023
4d989a0
Make error numbers sequential
skubakdj Sep 13, 2023
b99d928
Merge branch 'develop' into chore/remove-explorer
skubakdj Sep 13, 2023
3b818f9
Update CHANGELOG.md
skubakdj Sep 13, 2023
792c882
Update docs/CHANGELOG.md
patrickhuie19 Sep 13, 2023
03008eb
Merge branch 'develop' into chore/remove-explorer
patrickhuie19 Sep 13, 2023
605f41e
Update docs/CHANGELOG.md
skubakdj Sep 13, 2023
684664c
Merge branch 'develop' into chore/remove-explorer
skubakdj Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions core/services/chainlink/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,24 +129,24 @@ func (s *Secrets) SetFrom(f *Secrets) (err error) {
err = multierr.Append(err, config.NamedMultiErrorList(err1, "Database"))
}

if err3 := s.Password.SetFrom(&f.Password); err3 != nil {
err = multierr.Append(err, config.NamedMultiErrorList(err3, "Password"))
if err2 := s.Password.SetFrom(&f.Password); err2 != nil {
err = multierr.Append(err, config.NamedMultiErrorList(err2, "Password"))
}

if err4 := s.Pyroscope.SetFrom(&f.Pyroscope); err4 != nil {
err = multierr.Append(err, config.NamedMultiErrorList(err4, "Pyroscope"))
if err3 := s.Pyroscope.SetFrom(&f.Pyroscope); err3 != nil {
err = multierr.Append(err, config.NamedMultiErrorList(err3, "Pyroscope"))
}

if err5 := s.Prometheus.SetFrom(&f.Prometheus); err5 != nil {
err = multierr.Append(err, config.NamedMultiErrorList(err5, "Prometheus"))
if err4 := s.Prometheus.SetFrom(&f.Prometheus); err4 != nil {
err = multierr.Append(err, config.NamedMultiErrorList(err4, "Prometheus"))
}

if err6 := s.Mercury.SetFrom(&f.Mercury); err6 != nil {
err = multierr.Append(err, config.NamedMultiErrorList(err6, "Mercury"))
if err5 := s.Mercury.SetFrom(&f.Mercury); err5 != nil {
err = multierr.Append(err, config.NamedMultiErrorList(err5, "Mercury"))
}

if err7 := s.Threshold.SetFrom(&f.Threshold); err7 != nil {
err = multierr.Append(err, config.NamedMultiErrorList(err7, "Threshold"))
if err6 := s.Threshold.SetFrom(&f.Threshold); err6 != nil {
err = multierr.Append(err, config.NamedMultiErrorList(err6, "Threshold"))
}

_, err = utils.MultiErrorList(err)
Expand Down
12 changes: 12 additions & 0 deletions docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,18 @@ AllowSimplePasswords=true
### Removed

- Removed support for sending telemetry to the deprecated Explorer service
Copy link
Contributor

Choose a reason for hiding this comment

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

We should probably be explicit here about the config fields that are being removed and that node ops must remove them, since the node will reject a config that still has them and refuse to start.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jmank88 I just updated the changelog, could you please take a look?

skubakdj marked this conversation as resolved.
Show resolved Hide resolved
- Removed the following configuration:

```
ExplorerURL
```
- Removed the following secret configuration:

```
[Explorer]
AccessKey
Secret
```

<!-- unreleasedstop -->

Expand Down
Loading