gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

accounts/abi: mutex lock in TransactionByHash and code cleanup (#19133)

Browse Source
This commit is contained in:
Dan Kinsley
2019-02-20 02:08:54 -05:00
committed by Guillaume Ballet
parent d3ccedc767
commit f49f95e2b0
3 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
accounts/abi/bind/backends/simulated.go
View File

@@ -168,18 +168,18 @@ func (b *SimulatedBackend) TransactionReceipt(ctx context.Context, txHash common
// blockchain. The isPending return value indicates whether the transaction has been // blockchain. The isPending return value indicates whether the transaction has been
// mined yet. Note that the transaction may not be part of the canonical chain even if // mined yet. Note that the transaction may not be part of the canonical chain even if
// it's not pending. // it's not pending.
func (b *SimulatedBackend) TransactionByHash(ctx context.Context, txHash common.Hash) (tx *types.Transaction, isPending bool, err error) { func (b *SimulatedBackend) TransactionByHash(ctx context.Context, txHash common.Hash) (*types.Transaction, bool, error) {
b.mu.Lock()
defer b.mu.Unlock()
tx = b.pendingBlock.Transaction(txHash) tx := b.pendingBlock.Transaction(txHash)
if tx != nil { if tx != nil {
return tx, true, nil return tx, true, nil
} }
tx, _, _, _ = rawdb.ReadTransaction(b.database, txHash) tx, _, _, _ = rawdb.ReadTransaction(b.database, txHash)
if tx != nil { if tx != nil {
return tx, false, nil return tx, false, nil
} }
return nil, false, ethereum.NotFound return nil, false, ethereum.NotFound
} }

16
accounts/abi/bind/backends/simulated_test.go
View File

@@ -1,3 +1,19 @@
// Copyright 2019 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// The go-ethereum library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
package backends_test package backends_test
import ( import (

16
accounts/abi/bind/base_test.go
View File

@@ -1,3 +1,19 @@
// Copyright 2019 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// The go-ethereum library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
package bind_test package bind_test
import ( import (