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

Merge pull request #20046 from karalabe/graphql-fix-web-and-decoding

Browse Source 
common, graphql: fix hash/address decoding + UI content type
This commit is contained in:
Péter Szilágyi 2019-09-10 13:33:01 +03:00 committed by GitHub
commit 4f6bf2f1c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/types.go
View File

@ -149,7 +149,7 @@ func (h *Hash) UnmarshalGraphQL(input interface{}) error {
var err error var err error
switch input := input.(type) { switch input := input.(type) {
case string: case string:
*h = HexToHash(input) err = h.UnmarshalText([]byte(input))
default: default:
err = fmt.Errorf("Unexpected type for Bytes32: %v", input) err = fmt.Errorf("Unexpected type for Bytes32: %v", input)
} }
@ -288,7 +288,7 @@ func (a *Address) UnmarshalGraphQL(input interface{}) error {
var err error var err error
switch input := input.(type) { switch input := input.(type) {
case string: case string:
*a = HexToAddress(input) err = a.UnmarshalText([]byte(input))
default: default:
err = fmt.Errorf("Unexpected type for Address: %v", input) err = fmt.Errorf("Unexpected type for Address: %v", input)
} }

2
graphql/graphiql.go
View File

@ -52,7 +52,7 @@ func (h GraphiQL) ServeHTTP(w http.ResponseWriter, r *http.Request) {
respond(w, errorJSON("only GET requests are supported"), http.StatusMethodNotAllowed) respond(w, errorJSON("only GET requests are supported"), http.StatusMethodNotAllowed)
return return
} }
w.Header().Set("Content-Type", "text/html")
w.Write(graphiql) w.Write(graphiql)
} }