From 39317d03b42933aa722d8832554ffa04477cd07c Mon Sep 17 00:00:00 2001 From: Paul Berg Date: Tue, 4 Dec 2018 00:42:52 +0200 Subject: [PATCH] Fixed breaking changes --- signer/core/signed_data.go | 6 +++--- signer/rules/rules_test.go | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/signer/core/signed_data.go b/signer/core/signed_data.go index bcf77e4650..42b2911d4a 100644 --- a/signer/core/signed_data.go +++ b/signer/core/signed_data.go @@ -169,7 +169,7 @@ func (api *SignerAPI) determineSignatureFormat(contentType string, addr common.M } sighash, msg := SignTextValidator(validatorData) message := []*NameValueType{ - &NameValueType{ + { Name: "message", Typ: "text", Value: msg, @@ -191,7 +191,7 @@ func (api *SignerAPI) determineSignatureFormat(contentType string, addr common.M return nil, err } message := []*NameValueType{ - &NameValueType{ + { Name: "Clique block", Typ: "clique", Value: fmt.Sprintf("clique block %d [0x%x]", header.Number, header.Hash()), @@ -207,7 +207,7 @@ func (api *SignerAPI) determineSignatureFormat(contentType string, addr common.M } sighash, msg := SignTextPlain(plainData) message := []*NameValueType{ - &NameValueType{ + { Name: "message", Typ: "text/plain", Value: msg, diff --git a/signer/rules/rules_test.go b/signer/rules/rules_test.go index 7f5bf71ad5..bf44421848 100644 --- a/signer/rules/rules_test.go +++ b/signer/rules/rules_test.go @@ -642,9 +642,17 @@ function ApproveSignData(r){ addr, _ := mixAddr("0x694267f14675d7e1b9494fd8d72fefe1755710fa") fmt.Printf("address %v %v\n", addr.String(), addr.Original()) + + nvt := []*core.NameValueType{ + { + Name: "message", + Typ: "text/plain", + Value: msg, + }, + } resp, err := r.ApproveSignData(&core.SignDataRequest{ Address: *addr, - Message: msg, + Message: nvt, Hash: hash, Meta: core.Metadata{Remote: "remoteip", Local: "localip", Scheme: "inproc"}, Rawdata: raw,