cerc-io/go-ethereum
18
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Use logger.Error instead of 0 with glog

Browse Source
This commit is contained in:
Gustav Simonsson 2015-04-07 12:48:13 +02:00
parent 3f306f63d4
commit 2591883a18
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/types/transaction.go
View File

@ -9,6 +9,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/crypto/secp256k1" "github.com/ethereum/go-ethereum/crypto/secp256k1"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
) )
@ -132,7 +133,7 @@ func (tx *Transaction) PublicKey() []byte {
//pubkey, _ := secp256k1.RecoverPubkey(hash[:], sig) //pubkey, _ := secp256k1.RecoverPubkey(hash[:], sig)
p, err := crypto.SigToPub(hash[:], sig) p, err := crypto.SigToPub(hash[:], sig)
if err != nil { if err != nil {
glog.V(0).Infof("Could not get pubkey from signature: ", err) glog.V(logger.Error).Infof("Could not get pubkey from signature: ", err)
return nil return nil
} }
pubkey := crypto.FromECDSAPub(p) pubkey := crypto.FromECDSAPub(p)

3
core/vm/address.go
View File

@ -5,6 +5,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
) )
@ -84,7 +85,7 @@ func ecrecoverFunc(in []byte) []byte {
pubKey, err := crypto.Ecrecover(in[:32], rsv) pubKey, err := crypto.Ecrecover(in[:32], rsv)
// make sure the public key is a valid one // make sure the public key is a valid one
if err != nil { if err != nil {
glog.V(0).Infof("EC RECOVER FAIL: ", err) glog.V(logger.Error).Infof("EC RECOVER FAIL: ", err)
return nil return nil
} }

3
whisper/message.go
View File

@ -5,6 +5,7 @@ import (
"time" "time"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/logger/glog"
) )
@ -35,7 +36,7 @@ func (self *Message) Recover() *ecdsa.PublicKey {
defer func() { recover() }() // in case of invalid sig defer func() { recover() }() // in case of invalid sig
pub, err := crypto.SigToPub(self.hash(), self.Signature) pub, err := crypto.SigToPub(self.hash(), self.Signature)
if err != nil { if err != nil {
glog.V(0).Infof("Could not get pubkey from signature: ", err) glog.V(logger.Error).Infof("Could not get pubkey from signature: ", err)
return nil return nil
} }
return pub return pub