@@ -27,7 +27,7 @@ import (
2727// It will try to get the proof for the given key. If it is successful,
2828// it will return the height and also unserialize proof.Data into the data
2929// argument (so pass in a pointer to the appropriate struct)
30- func GetParsed (key []byte , data interface {}, height int , prove bool ) (uint64 , error ) {
30+ func GetParsed (key []byte , data interface {}, height int64 , prove bool ) (int64 , error ) {
3131 bs , h , err := Get (key , height , prove )
3232 if err != nil {
3333 return 0 , err
@@ -47,16 +47,19 @@ func GetParsed(key []byte, data interface{}, height int, prove bool) (uint64, er
4747// we just repeat whatever any (potentially malicious) node gives us.
4848// Only use that if you are running the full node yourself,
4949// and it is localhost or you have a secure connection (not HTTP)
50- func Get (key []byte , height int , prove bool ) (data.Bytes , uint64 , error ) {
50+ func Get (key []byte , height int64 , prove bool ) (data.Bytes , int64 , error ) {
5151 if height < 0 {
5252 return nil , 0 , fmt .Errorf ("Height cannot be negative" )
5353 }
5454
5555 if ! prove {
5656 node := commands .GetNode ()
5757 resp , err := node .ABCIQueryWithOptions ("/key" , key ,
58- rpcclient.ABCIQueryOptions {Trusted : true , Height : uint64 (height )})
59- return data .Bytes (resp .Value ), resp .Height , err
58+ rpcclient.ABCIQueryOptions {Trusted : true , Height : int64 (height )})
59+ if resp == nil {
60+ return nil , height , err
61+ }
62+ return data .Bytes (resp .Response .Value ), resp .Response .Height , err
6063 }
6164 val , h , _ , err := GetWithProof (key , height )
6265 return val , h , err
@@ -65,7 +68,7 @@ func Get(key []byte, height int, prove bool) (data.Bytes, uint64, error) {
6568// GetWithProof returns the values stored under a given key at the named
6669// height as in Get. Additionally, it will return a validated merkle
6770// proof for the key-value pair if it exists, and all checks pass.
68- func GetWithProof (key []byte , height int ) (data.Bytes , uint64 , iavl.KeyProof , error ) {
71+ func GetWithProof (key []byte , height int64 ) (data.Bytes , int64 , iavl.KeyProof , error ) {
6972 node := commands .GetNode ()
7073 cert , err := commands .GetCertifier ()
7174 if err != nil {
@@ -93,19 +96,19 @@ func ParseHexKey(args []string, argname string) ([]byte, error) {
9396}
9497
9598// GetHeight reads the viper config for the query height
96- func GetHeight () int {
97- return viper .GetInt (FlagHeight )
99+ func GetHeight () int64 {
100+ return int64 ( viper .GetInt (FlagHeight ) )
98101}
99102
100103type proof struct {
101- Height uint64 `json:"height"`
104+ Height int64 `json:"height"`
102105 Data interface {} `json:"data"`
103106}
104107
105108// FoutputProof writes the output of wrapping height and info
106109// in the form {"data": <the_data>, "height": <the_height>}
107110// to the provider io.Writer
108- func FoutputProof (w io.Writer , v interface {}, height uint64 ) error {
111+ func FoutputProof (w io.Writer , v interface {}, height int64 ) error {
109112 wrap := & proof {height , v }
110113 blob , err := data .ToJSON (wrap )
111114 if err != nil {
@@ -118,6 +121,6 @@ func FoutputProof(w io.Writer, v interface{}, height uint64) error {
118121// OutputProof prints the proof to stdout
119122// reuse this for printing proofs and we should enhance this for text/json,
120123// better presentation of height
121- func OutputProof (data interface {}, height uint64 ) error {
124+ func OutputProof (data interface {}, height int64 ) error {
122125 return FoutputProof (os .Stdout , data , height )
123126}
0 commit comments