update to current develop 1.5.0-unstable

ethersphere · May 2, 2016 · e545ed7 · e545ed7
1 parent 9523a11
commit e545ed7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/accounts/account_manager.go b/accounts/account_manager.go
@@ -148,8 +148,8 @@ func (am *Manager) Sign(addr common.Address, hash []byte) (signature []byte, err
 }
 
 func (am *Manager) GetUnlocked(addr common.Address) (prvkey *ecdsa.PrivateKey, err error) {
-	am.mutex.RLock()
-	defer am.mutex.RUnlock()
+	am.mu.RLock()
+	defer am.mu.RUnlock()
 	unlockedKey, found := am.unlocked[addr]
 	if !found {
 		return nil, ErrLocked

diff --git a/common/registrar/api.go b/common/registrar/api.go
@@ -23,7 +23,6 @@ import (
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/compiler"
-	"github.com/ethereum/go-ethereum/common/registrar"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"

diff --git a/internal/web3ext/web3ext.go b/internal/web3ext/web3ext.go
@@ -49,14 +49,19 @@ web3._extend({
 			name: 'lockAccount',
 			call: 'personal_lockAccount',
 			params: 1
+		}),
+		new web3._extend.Method({
+			name: 'importRawKey',
+			call: 'personal_importRawKey',
+			params: 2
 		})
 	],
 	properties:
 	[
 		new web3._extend.Property({
 			name: 'listAccounts',
 			getter: 'personal_listAccounts'
-		})
+		}),
 	]
 });
 `
@@ -210,20 +215,6 @@ web3._extend({
 });
 `
 
-const Personal_JS = `
-web3._extend({
-	property: 'personal',
-	methods:
-	[
-		new web3._extend.Method({
-			name: 'importRawKey',
-			call: 'personal_importRawKey',
-			params: 2
-		})
-	]
-});
-`
-
 const Eth_JS = `
 web3._extend({
 	property: 'eth',