From c45f41cb6ec3426d30be4c34d6d0d9bd9a2e4b67 Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Tue, 5 Feb 2019 15:06:37 +0100
Subject: [PATCH] signer: linter fixes, remove deprecated crypto dependency

---
 accounts/accounts.go       | 6 ++++--
 signer/core/signed_data.go | 2 +-
 signer/rules/rules_test.go | 5 ++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/accounts/accounts.go b/accounts/accounts.go
index e8031e8b3b..6cf50b98d0 100644
--- a/accounts/accounts.go
+++ b/accounts/accounts.go
@@ -19,12 +19,12 @@ package accounts
 
 import (
 	"fmt"
+	"golang.org/x/crypto/sha3"
 	"math/big"
 
 	ethereum "github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/event"
 )
 
@@ -188,7 +188,9 @@ func TextHash(data []byte) []byte {
 // This gives context to the signed message and prevents signing of transactions.
 func TextAndHash(data []byte) ([]byte, string) {
 	msg := fmt.Sprintf("\x19Ethereum Signed Message:\n%d%s", len(data), string(data))
-	return crypto.Keccak256([]byte(msg)), msg
+	hasher := sha3.NewLegacyKeccak256()
+	hasher.Write([]byte(msg))
+	return hasher.Sum(nil), msg
 }
 
 // WalletEventType represents the different event types that can be fired by
diff --git a/signer/core/signed_data.go b/signer/core/signed_data.go
index 0d6ccbaa1b..ac0b97bcad 100644
--- a/signer/core/signed_data.go
+++ b/signer/core/signed_data.go
@@ -21,7 +21,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/ethereum/go-ethereum/consensus/clique"
 	"math/big"
 	"mime"
 	"regexp"
@@ -35,6 +34,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/ethereum/go-ethereum/consensus/clique"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/rlp"
diff --git a/signer/rules/rules_test.go b/signer/rules/rules_test.go
index 2f5b0d593a..d3b2edd551 100644
--- a/signer/rules/rules_test.go
+++ b/signer/rules/rules_test.go
@@ -637,8 +637,7 @@ function ApproveSignData(r){
 		return
 	}
 	message := "baz bazonk foo"
-	hash, _ := core.SignTextPlain([]byte(message))
-	raw := hexutil.Bytes(message)
+	hash, rawdata := accounts.TextAndHash([]byte(message))
 	addr, _ := mixAddr("0x694267f14675d7e1b9494fd8d72fefe1755710fa")
 
 	fmt.Printf("address %v %v\n", addr.String(), addr.Original())
@@ -655,7 +654,7 @@ function ApproveSignData(r){
 		Message: nvt,
 		Hash:    hash,
 		Meta:    core.Metadata{Remote: "remoteip", Local: "localip", Scheme: "inproc"},
-		Rawdata: raw,
+		Rawdata: []byte(rawdata),
 	})
 	if err != nil {
 		t.Fatalf("Unexpected error %v", err)