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

common, graphql: fix hash/address decoding + UI content type
pull/20047/head
Péter Szilágyi 5 years ago committed by GitHub
commit 4f6bf2f1c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      common/types.go
  2. 2
      graphql/graphiql.go

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

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

Loading…
Cancel
Save