Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

R4R: generalize query response with height #4573

Merged
merged 19 commits into from
Jul 1, 2019
Merged

R4R: generalize query response with height #4573

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
60e0267
add height in validator endpoint response
colin-axner Jun 17, 2019
bb1a498
generalize response with height
colin-axner Jun 17, 2019
3c0faea
pending log
colin-axner Jun 17, 2019
975073f
beginning part of test for rest
colin-axner Jun 19, 2019
62fcc39
updated postprocessresponse to encode in height, added wip test
colin-axner Jun 20, 2019
8aacfa5
added passing postprocessresponse test
colin-axner Jun 21, 2019
fd4e7f3
merge and updated post process response call to include height
colin-axner Jun 21, 2019
3a61eb7
update delegator json tag
colin-axner Jun 21, 2019
cc115ef
revert indenting to two spaces
colin-axner Jun 21, 2019
ca2618c
update pending log
colin-axner Jun 21, 2019
73c8f81
fix function comment
colin-axner Jun 21, 2019
5a845b2
rm unused fmt import
colin-axner Jun 21, 2019
1619f90
height set in ctx instead of passed in func
colin-axner Jun 24, 2019
2d4e65a
add GetAccountWithHeight
colin-axner Jun 25, 2019
4f86411
fix merge conflict
colin-axner Jun 25, 2019
8d06eb0
fix build errors
colin-axner Jun 25, 2019
5809c5e
misspelling
colin-axner Jun 25, 2019
18cbfbd
address @alessio pr comments; remove x/auth dependency
colin-axner Jul 1, 2019
99b2c65
Merge branch 'colin/generalize-height-queries' of github.com:colin-ax…
colin-axner Jul 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
revert indenting to two spaces
  • Loading branch information
@colin-axner
colin-axner committed Jun 21, 2019
commit cc115ef7d4e1cf1870932e9d797d218a7727a175
4 changes: 2 additions & 2 deletions types/rest/rest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ func PostProcessResponse(w http.ResponseWriter, cliCtx context.CLIContext, respo
default:
var err error
if cliCtx.Indent {
output, err = cliCtx.Codec.MarshalJSONIndent(response, "", " ")
output, err = cliCtx.Codec.MarshalJSONIndent(response, "", " ")
} else {
output, err = cliCtx.Codec.MarshalJSON(response)
}
Expand All @@ -267,7 +267,7 @@ func PostProcessResponse(w http.ResponseWriter, cliCtx context.CLIContext, respo
m["height"] = height

if cliCtx.Indent {
output, err = json.MarshalIndent(m, "", " ")
output, err = json.MarshalIndent(m, "", " ")
} else {
output, err = json.Marshal(m)
}
Expand Down
9 changes: 5 additions & 4 deletions types/rest/rest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package rest

import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
Expand Down Expand Up @@ -165,7 +166,7 @@ func TestProcessPostResponse(t *testing.T) {
jsonNoHeight, err := cdc.MarshalJSON(acc)
require.Nil(t, err)
require.NotNil(t, jsonNoHeight)
jsonIndentNoHeight, err := cdc.MarshalJSONIndent(acc, "", " ")
jsonIndentNoHeight, err := cdc.MarshalJSONIndent(acc, "", " ")
require.Nil(t, err)
require.NotNil(t, jsonIndentNoHeight)

Expand All @@ -176,8 +177,8 @@ func TestProcessPostResponse(t *testing.T) {
jsonMap, err := json.Marshal(m)
require.Nil(t, err)
jsonWithHeight := append(append([]byte(`{"height":`), []byte(strconv.Itoa(int(height))+",")...), jsonMap[1:]...)
jsonIndentMap, err := json.MarshalIndent(m, "", " ")
jsonIndentWithHeight := append(append([]byte(`{`+"\n "+`"height": `), []byte(strconv.Itoa(int(height))+",")...), jsonIndentMap[1:]...)
jsonIndentMap, err := json.MarshalIndent(m, "", " ")
jsonIndentWithHeight := append(append([]byte(`{`+"\n "+` "height": `), []byte(strconv.Itoa(int(height))+",")...), jsonIndentMap[1:]...)

// check that negative height writes an error
w := httptest.NewRecorder()
Expand Down Expand Up @@ -215,7 +216,7 @@ func runPostProcessResponse(t *testing.T, ctx context.CLIContext, obj interface{

var marshalled []byte
if indent {
marshalled, err = ctx.Codec.MarshalJSONIndent(obj, "", " ")
marshalled, err = ctx.Codec.MarshalJSONIndent(obj, "", " ")
} else {
marshalled, err = ctx.Codec.MarshalJSON(obj)
}
Expand Down