certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changes to /stake/candidates REST handler

This commit is contained in:
Matt Bell 2018-05-21 10:52:06 +09:00
parent cb107c7383
commit 6ad16e6c90
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/lcd/lcd_test.go
View File

@ -387,7 +387,7 @@ func startTMAndLCD() (*nm.Node, net.Listener, error) {
config.Consensus.SkipTimeoutCommit = false config.Consensus.SkipTimeoutCommit = false
logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)) logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout))
// logger = log.NewFilter(logger, log.AllowError()) logger = log.NewFilter(logger, log.AllowError())
privValidatorFile := config.PrivValidatorFile() privValidatorFile := config.PrivValidatorFile()
privVal := pvm.LoadOrGenFilePV(privValidatorFile) privVal := pvm.LoadOrGenFilePV(privValidatorFile)
db := dbm.NewMemDB() db := dbm.NewMemDB()

21
x/stake/client/rest/query.go
View File

@ -79,25 +79,28 @@ func bondingStatusHandlerFn(storeName string, cdc *wire.Codec, ctx context.CoreC
// candidatesHandlerFn - http request handler to query list of candidates // candidatesHandlerFn - http request handler to query list of candidates
func candidatesHandlerFn(storeName string, cdc *wire.Codec, ctx context.CoreContext) http.HandlerFunc { func candidatesHandlerFn(storeName string, cdc *wire.Codec, ctx context.CoreContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
res, err := ctx.Query(stake.CandidatesKey, storeName) res, err := ctx.QuerySubspace(cdc, stake.CandidatesKey, storeName)
if err != nil { if err != nil {
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(fmt.Sprintf("Couldn't query bond. Error: %s", err.Error()))) w.Write([]byte(fmt.Sprintf("Couldn't query candidates. Error: %s", err.Error())))
return return
} }
// the query will return empty if there is no data for this bond
if len(res) == 0 { if len(res) == 0 {
w.WriteHeader(http.StatusNoContent) w.WriteHeader(http.StatusNoContent)
return return
} }
var candidates []stake.Candidate candidates := make(stake.Candidates, 0, len(res))
err = cdc.UnmarshalBinary(res, &candidates) for _, kv := range res {
if err != nil { var candidate stake.Candidate
w.WriteHeader(http.StatusInternalServerError) err = cdc.UnmarshalBinary(kv.Value, &candidate)
w.Write([]byte(fmt.Sprintf("Couldn't decode candidates. Error: %s", err.Error()))) if err != nil {
return w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(fmt.Sprintf("Couldn't decode candidate. Error: %s", err.Error())))
return
}
candidates = append(candidates, candidate)
} }
output, err := cdc.MarshalJSON(candidates) output, err := cdc.MarshalJSON(candidates)