roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

accounts: fix megacheck warnings (#14903)

Browse Source 
* accounts: fix megacheck warnings

* accounts: don't modify abi in favor of full cleanup
This commit is contained in:
Egon Elbre 2017-08-07 14:11:15 +03:00 committed by Péter Szilágyi
parent f7848c2aa5
commit 7c74e166b0
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
accounts/keystore/key.go
View File

@ -91,14 +91,6 @@ type cipherparamsJSON struct {
IV string `json:"iv"` IV string `json:"iv"`
} }
type scryptParamsJSON struct {
N int `json:"n"`
R int `json:"r"`
P int `json:"p"`
DkLen int `json:"dklen"`
Salt string `json:"salt"`
}
func (k *Key) MarshalJSON() (j []byte, err error) { func (k *Key) MarshalJSON() (j []byte, err error) {
jStruct := plainKeyJSON{ jStruct := plainKeyJSON{
hex.EncodeToString(k.Address[:]), hex.EncodeToString(k.Address[:]),

4
accounts/keystore/keystore_passphrase.go
View File

@ -140,7 +140,7 @@ func EncryptKey(key *Key, auth string, scryptN, scryptP int) ([]byte, error) {
Cipher: "aes-128-ctr", Cipher: "aes-128-ctr",
CipherText: hex.EncodeToString(cipherText), CipherText: hex.EncodeToString(cipherText),
CipherParams: cipherParamsJSON, CipherParams: cipherParamsJSON,
KDF: "scrypt", KDF: keyHeaderKDF,
KDFParams: scryptParamsJSON, KDFParams: scryptParamsJSON,
MAC: hex.EncodeToString(mac), MAC: hex.EncodeToString(mac),
} }
@ -275,7 +275,7 @@ func getKDFKey(cryptoJSON cryptoJSON, auth string) ([]byte, error) {
} }
dkLen := ensureInt(cryptoJSON.KDFParams["dklen"]) dkLen := ensureInt(cryptoJSON.KDFParams["dklen"])
if cryptoJSON.KDF == "scrypt" { if cryptoJSON.KDF == keyHeaderKDF {
n := ensureInt(cryptoJSON.KDFParams["n"]) n := ensureInt(cryptoJSON.KDFParams["n"])
r := ensureInt(cryptoJSON.KDFParams["r"]) r := ensureInt(cryptoJSON.KDFParams["r"])
p := ensureInt(cryptoJSON.KDFParams["p"]) p := ensureInt(cryptoJSON.KDFParams["p"])

9
accounts/usbwallet/ledger_hub.go
View File

@ -197,11 +197,10 @@ func (hub *LedgerHub) Subscribe(sink chan<- accounts.WalletEvent) event.Subscrip
// is not running). // is not running).
func (hub *LedgerHub) updater() { func (hub *LedgerHub) updater() {
for { for {
// Wait for a USB hotplug event (not supported yet) or a refresh timeout // TODO: Wait for a USB hotplug event (not supported yet) or a refresh timeout
select { // <-hub.changes
//case <-hub.changes: // reenable on hutplug implementation time.Sleep(ledgerRefreshCycle)
case <-time.After(ledgerRefreshCycle):
}
// Run the wallet refresher // Run the wallet refresher
hub.refreshWallets() hub.refreshWallets()