TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2024-11-22 09:29:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3665 from nspcc-dev/http-code-status-ok

Browse source 
rpcsrv: align default error code with C# implementation
This commit is contained in:
Anna Shaleva 2024-11-12 17:19:03 +03:00 committed by GitHub
commit dda2cafdf8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 0 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkg/services/rpcsrv/error.go
View file

@ -1,8 +1,6 @@
package rpcsrv package rpcsrv
import ( import (
"net/http"
"github.com/nspcc-dev/neo-go/pkg/neorpc" "github.com/nspcc-dev/neo-go/pkg/neorpc"
) )
@ -36,18 +34,3 @@ func (ab abstractBatch) RunForErrors(f func(jsonErr *neorpc.Error)) {
a.RunForErrors(f) a.RunForErrors(f)
} }
} }
func getHTTPCodeForError(respErr *neorpc.Error) int {
var httpCode int
switch respErr.Code {
case neorpc.BadRequestCode:
httpCode = http.StatusBadRequest
case neorpc.MethodNotFoundCode:
httpCode = http.StatusMethodNotAllowed
case neorpc.InternalServerErrorCode:
httpCode = http.StatusInternalServerError
default:
httpCode = http.StatusUnprocessableEntity
}
return httpCode
}

6
pkg/services/rpcsrv/server.go
View file

@ -3100,12 +3100,6 @@ func (s *Server) writeHTTPServerResponse(r *params.Request, w http.ResponseWrite
if s.config.EnableCORSWorkaround { if s.config.EnableCORSWorkaround {
setCORSOriginHeaders(w.Header()) setCORSOriginHeaders(w.Header())
} }
if r.In != nil {
resp := resp.(abstract)
if resp.Error != nil {
w.WriteHeader(getHTTPCodeForError(resp.Error))
}
}
encoder := json.NewEncoder(w) encoder := json.NewEncoder(w)
err := encoder.Encode(resp) err := encoder.Encode(resp)