Merge branch 'deadlock'

benma · benma · commit 91f3f1aa78a7 · 2023-12-05T11:50:56.000+01:00
diff --git a/backend/backend.go b/backend/backend.go
@@ -910,13 +910,14 @@ func (backend *Backend) SetWatchonly(watchonly bool) error {
 			nil,
 		)
 	}
+
+	accounts := accountsList(backend.Accounts())
 	// When enabling watchonly, we turn the currently loaded accounts into watch-only accounts.
 	t := true
 	return backend.AccountSetWatch(
 		func(account *config.Account) bool {
 			// Apply to each currently loaded account.
-			defer backend.accountsAndKeystoreLock.RLock()()
-			return backend.accounts.lookup(account.Code) != nil
+			return accounts.lookup(account.Code) != nil
 		},
 		&t,
 	)

Original file line number	Diff line number	Diff line change
`@@ -910,13 +910,14 @@ func (backend *Backend) SetWatchonly(watchonly bool) error {`
`910`	`910`	`nil,`
`911`	`911`	`)`
`912`	`912`	`}`
	`913`	`+`
	`914`	`+ accounts := accountsList(backend.Accounts())`
`913`	`915`	`// When enabling watchonly, we turn the currently loaded accounts into watch-only accounts.`
`914`	`916`	`t := true`
`915`	`917`	`return backend.AccountSetWatch(`
`916`	`918`	`func(account *config.Account) bool {`
`917`	`919`	`// Apply to each currently loaded account.`
`918`		`- defer backend.accountsAndKeystoreLock.RLock()()`
`919`		`- return backend.accounts.lookup(account.Code) != nil`
	`920`	`+ return accounts.lookup(account.Code) != nil`
`920`	`921`	`},`
`921`	`922`	`&t,`
`922`	`923`	`)`