You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

46 lines
851 B

rpc/lib/client & server: try to conform to JSON-RPC 2.0 spec (#4141) https://www.jsonrpc.org/specification What is done in this PR: JSONRPCClient: validate that Response.ID matches Request.ID I wanted to do the same for the WSClient, but since we're sending events as responses, not notifications, checking IDs would require storing them in memory indefinitely (and we won't be able to remove them upon client unsubscribing because ID is different then). Request.ID is now optional. Notification is a Request without an ID. Previously "" or 0 were considered as notifications Remove #event suffix from ID from an event response (partially fixes #2949) ID must be either string, int or null AND must be equal to request's ID. Now, because we've implemented events as responses, WS clients are tripping when they see Response.ID("0#event") != Request.ID("0"). Implementing events as requests would require a lot of time (~ 2 days to completely rewrite WS client and server) generate unique ID for each request switch to integer IDs instead of "json-client-XYZ" id=0 method=/subscribe id=0 result=... id=1 method=/abci_query id=1 result=... > send events (resulting from /subscribe) as requests+notifications (not responses) this will require a lot of work. probably not worth it * rpc: generate an unique ID for each request in conformance with JSON-RPC spec * WSClient: check for unsolicited responses * fix golangci warnings * save commit * fix errors * remove ID from responses from subscribe Refs #2949 * clients are safe for concurrent access * tm-bench: switch to int ID * fixes after my own review * comment out sentIDs in WSClient see commit body for the reason * remove body.Close it will be closed automatically * stop ws connection outside of write/read routines also, use t.Rate in tm-bench indexer when calculating ID fix gocritic issues * update swagger.yaml * Apply suggestions from code review * fix stylecheck and golint linter warnings * update changelog * update changelog2
5 years ago
  1. package client
  2. import (
  3. "fmt"
  4. "net/url"
  5. "reflect"
  6. amino "github.com/tendermint/go-amino"
  7. )
  8. func argsToURLValues(cdc *amino.Codec, args map[string]interface{}) (url.Values, error) {
  9. values := make(url.Values)
  10. if len(args) == 0 {
  11. return values, nil
  12. }
  13. err := argsToJSON(cdc, args)
  14. if err != nil {
  15. return nil, err
  16. }
  17. for key, val := range args {
  18. values.Set(key, val.(string))
  19. }
  20. return values, nil
  21. }
  22. func argsToJSON(cdc *amino.Codec, args map[string]interface{}) error {
  23. for k, v := range args {
  24. rt := reflect.TypeOf(v)
  25. isByteSlice := rt.Kind() == reflect.Slice && rt.Elem().Kind() == reflect.Uint8
  26. if isByteSlice {
  27. bytes := reflect.ValueOf(v).Bytes()
  28. args[k] = fmt.Sprintf("0x%X", bytes)
  29. continue
  30. }
  31. data, err := cdc.MarshalJSON(v)
  32. if err != nil {
  33. return err
  34. }
  35. args[k] = string(data)
  36. }
  37. return nil
  38. }