Commit 59b28cfa authored by Jeffrey Wilcke's avatar Jeffrey Wilcke

Merge pull request #1663 from obscuren/issue-1662

xeth: added a transact mu
parents 5c5c3930 7bb5ac04
...@@ -89,8 +89,7 @@ type XEth struct { ...@@ -89,8 +89,7 @@ type XEth struct {
messagesMu sync.RWMutex messagesMu sync.RWMutex
messages map[int]*whisperFilter messages map[int]*whisperFilter
// regmut sync.Mutex transactMu sync.Mutex
// register map[string][]*interface{} // TODO improve return type
agent *miner.RemoteAgent agent *miner.RemoteAgent
...@@ -952,8 +951,9 @@ func (self *XEth) Transact(fromStr, toStr, nonceStr, valueStr, gasStr, gasPriceS ...@@ -952,8 +951,9 @@ func (self *XEth) Transact(fromStr, toStr, nonceStr, valueStr, gasStr, gasPriceS
} }
*/ */
// TODO: align default values to have the same type, e.g. not depend on self.transactMu.Lock()
// common.Value conversions later on defer self.transactMu.Unlock()
var nonce uint64 var nonce uint64
if len(nonceStr) != 0 { if len(nonceStr) != 0 {
nonce = common.Big(nonceStr).Uint64() nonce = common.Big(nonceStr).Uint64()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment