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

Don't Stop unstarted app in RebroadcastTransactions #8615

Merged
merged 11 commits into from
Mar 16, 2023
Merged

Don't Stop unstarted app in RebroadcastTransactions #8615

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6197cc4
Don't Stop unstarted local app
martin-cll Mar 2, 2023
f6df13f
Modify test
martin-cll Mar 2, 2023
f11b60f
Remove expected Stop call in test
martin-cll Mar 2, 2023
1b7cf13
Remove expected Stop call in test 2
martin-cll Mar 6, 2023
28814d2
Merge branch 'develop' into fix/dont-stop-unstarted-app
martin-cll Mar 6, 2023
71b3427
Merge branch 'develop' into fix/dont-stop-unstarted-app
martin-cll Mar 7, 2023
8b828af
Merge branch 'develop' into fix/dont-stop-unstarted-app
reductionista Mar 14, 2023
5a5f141
Merge branch 'develop' into fix/dont-stop-unstarted-app
martin-cll Mar 14, 2023
65c5335
Merge branch 'develop' into fix/dont-stop-unstarted-app
martin-cll Mar 15, 2023
16c3e5c
Merge branch 'develop' into fix/dont-stop-unstarted-app
reductionista Mar 15, 2023
596cfdb
Merge branch 'develop' into fix/dont-stop-unstarted-app
reductionista Mar 15, 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
5 changes: 0 additions & 5 deletions core/cmd/local_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,11 +519,6 @@ func (cli *Client) RebroadcastTransactions(c *clipkg.Context) (err error) {
if err != nil {
return cli.errorOut(errors.Wrap(err, "fatal error instantiating application"))
}
defer func() {
if serr := app.Stop(); serr != nil {
err = multierr.Append(err, serr)
}
}()
pwd, err := utils.PasswordFromFile(c.String("password"))
if err != nil {
return cli.errorOut(fmt.Errorf("error reading password: %+v", err))
Expand Down
2 changes: 0 additions & 2 deletions core/cmd/local_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,6 @@ func TestClient_RebroadcastTransactions_Txm(t *testing.T) {
app := mocks.NewApplication(t)
app.On("GetSqlxDB").Return(sqlxDB)
app.On("GetKeyStore").Return(keyStore)
app.On("Stop").Return(nil)
app.On("ID").Maybe().Return(uuid.NewV4())
ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
app.On("GetChains").Return(chainlink.Chains{EVM: cltest.NewChainSetMockWithOneChain(t, ethClient, evmtest.NewChainScopedConfig(t, config))}).Maybe()
Expand Down Expand Up @@ -488,7 +487,6 @@ func TestClient_RebroadcastTransactions_OutsideRange_Txm(t *testing.T) {
app := mocks.NewApplication(t)
app.On("GetSqlxDB").Return(sqlxDB)
app.On("GetKeyStore").Return(keyStore)
app.On("Stop").Return(nil)
app.On("ID").Maybe().Return(uuid.NewV4())
ethClient := evmtest.NewEthClientMockWithDefaultChain(t)
ethClient.On("Dial", mock.Anything).Return(nil)
Expand Down