forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 02:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feat: accept conversation

Browse source
This commit is contained in:
songzhibin97 2024-04-23 16:44:31 +08:00
parent 7cb6ebf14d
commit d96fe89963
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
accounts/keystore/keystore.go
View file

@ -312,8 +312,9 @@ func (ks *KeyStore) Unlock(a accounts.Account, passphrase string) error {
// Lock removes the private key with the given address from memory. // Lock removes the private key with the given address from memory.
func (ks *KeyStore) Lock(addr common.Address) error { func (ks *KeyStore) Lock(addr common.Address) error {
ks.mu.Lock() ks.mu.Lock()
defer ks.mu.Unlock() unl, found := ks.unlocked[addr]
if unl, found := ks.unlocked[addr]; found { ks.mu.Unlock()
if found {
ks.expire(addr, unl, time.Duration(0)*time.Nanosecond) ks.expire(addr, unl, time.Duration(0)*time.Nanosecond)
} }
return nil return nil

1
cmd/utils/history_test.go
View file

@ -113,7 +113,6 @@ func TestHistoryImportAndExport(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("error opening era file: %v", err) t.Fatalf("error opening era file: %v", err)
} }
defer f.Close()
var ( var (
h = sha256.New() h = sha256.New()
buf = bytes.NewBuffer(nil) buf = bytes.NewBuffer(nil)