Merge pull request #296 from cosmos/upgrade

Upgrade

Author: ebuchman

app/app_test.go

@@ -118,7 +118,7 @@ func (at *appTest) reset() {
 	at.initAccount(at.acctOut)
 
 	resabci := at.app.Commit()
-	require.True(at.t, resabci.Code.IsOK(), resabci)
+	require.True(at.t, resabci.IsOK(), resabci)
 }
 
 func getBalance(key sdk.Actor, store state.SimpleDB) (coin.Coins, error) {
@@ -145,7 +145,7 @@ func (at *appTest) execDeliver(t *testing.T, tx sdk.Tx) (res abci.ResponseDelive
 	res = at.app.DeliverTx(txBytes)
 
 	// check the tags
-	if res.Code.IsOK() {
+	if res.IsOK() {
 		tags := res.Tags
 		require.NotEmpty(tags)
 		require.Equal("height", tags[0].Key)
@@ -270,13 +270,13 @@ func TestTx(t *testing.T) {
 	//Regular CheckTx
 	at.reset()
 	cres, _, _ = at.execCheck(t, at.getTx(coin.Coins{{"mycoin", 5}}, 1))
-	assert.True(cres.Code.IsOK(), "ExecTx/Good CheckTx: Expected OK return from ExecTx, Error: %v", cres)
+	assert.True(cres.IsOK(), "ExecTx/Good CheckTx: Expected OK return from ExecTx, Error: %v", cres)
 
 	//Regular DeliverTx
 	at.reset()
 	amt := coin.Coins{{"mycoin", 3}}
 	dres, diffIn, diffOut = at.execDeliver(t, at.getTx(amt, 1))
-	assert.True(dres.Code.IsOK(), "ExecTx/Good DeliverTx: Expected OK return from ExecTx, Error: %v", dres)
+	assert.True(dres.IsOK(), "ExecTx/Good DeliverTx: Expected OK return from ExecTx, Error: %v", dres)
 	assert.Equal(amt.Negative(), diffIn)
 	assert.Equal(amt, diffOut)
 
@@ -285,7 +285,7 @@ func TestTx(t *testing.T) {
 	amt = coin.Coins{{"mycoin", 4}}
 	toll := coin.Coin{"mycoin", 1}
 	dres, diffIn, diffOut = at.execDeliver(t, at.feeTx(amt, toll, 1))
-	assert.True(dres.Code.IsOK(), "ExecTx/Good DeliverTx: Expected OK return from ExecTx, Error: %v", dres)
+	assert.True(dres.IsOK(), "ExecTx/Good DeliverTx: Expected OK return from ExecTx, Error: %v", dres)
 	payment := amt.Plus(coin.Coins{toll}).Negative()
 	assert.Equal(payment, diffIn)
 	assert.Equal(amt, diffOut)
@@ -297,15 +297,15 @@ func TestQuery(t *testing.T) {
 	at := newAppTest(t)
 
 	dres, _, _ := at.execDeliver(t, at.getTx(coin.Coins{{"mycoin", 5}}, 1))
-	assert.True(dres.Code.IsOK(), "Commit, DeliverTx: Expected OK return from DeliverTx, Error: %v", dres)
+	assert.True(dres.IsOK(), "Commit, DeliverTx: Expected OK return from DeliverTx, Error: %v", dres)
 
 	resQueryPreCommit := at.app.Query(abci.RequestQuery{
 		Path: "/account",
 		Data: at.acctIn.Address(),
 	})
 
 	cres := at.app.Commit()
-	assert.True(cres.Code.IsOK(), cres)
+	assert.True(cres.IsOK(), cres)
 
 	key := stack.PrefixedKey(coin.NameCoin, at.acctIn.Address())
 	resQueryPostCommit := at.app.Query(abci.RequestQuery{

app/store.go

@@ -37,7 +37,7 @@ type StoreApp struct {
 	pending []*abci.Validator
 
 	// height is last committed block, DeliverTx is the next one
-	height uint64
+	height int64
 
 	logger log.Logger
 }
@@ -99,12 +99,12 @@ func (app *StoreApp) Check() sm.SimpleDB {
 
 // CommittedHeight gets the last block height committed
 // to the db
-func (app *StoreApp) CommittedHeight() uint64 {
+func (app *StoreApp) CommittedHeight() int64 {
 	return app.height
 }
 
 // WorkingHeight gets the current block we are writing
-func (app *StoreApp) WorkingHeight() uint64 {
+func (app *StoreApp) WorkingHeight() int64 {
 	return app.height + 1
 }
 
@@ -135,7 +135,7 @@ func (app *StoreApp) SetOption(res abci.RequestSetOption) abci.ResponseSetOption
 func (app *StoreApp) Query(reqQuery abci.RequestQuery) (resQuery abci.ResponseQuery) {
 	if len(reqQuery.Data) == 0 {
 		resQuery.Log = "Query cannot be zero length"
-		resQuery.Code = abci.CodeType_EncodingError
+		resQuery.Code = errors.CodeTypeEncodingErr
 		return
 	}
 
@@ -150,7 +150,7 @@ func (app *StoreApp) Query(reqQuery abci.RequestQuery) (resQuery abci.ResponseQu
 		// is not yet in the blockchain
 
 		withProof := app.CommittedHeight() - 1
-		if tree.Tree.VersionExists(withProof) {
+		if tree.Tree.VersionExists(uint64(withProof)) {
 			height = withProof
 		} else {
 			height = app.CommittedHeight()
@@ -176,7 +176,7 @@ func (app *StoreApp) Query(reqQuery abci.RequestQuery) (resQuery abci.ResponseQu
 		}
 
 	default:
-		resQuery.Code = abci.CodeType_UnknownRequest
+		resQuery.Code = errors.CodeTypeUnknownRequest
 		resQuery.Log = cmn.Fmt("Unexpected Query path: %v", reqQuery.Path)
 	}
 	return
@@ -243,7 +243,7 @@ func pubKeyIndex(val *abci.Validator, list []*abci.Validator) int {
 	return -1
 }
 
-func loadState(dbName string, cacheSize int, historySize uint64) (*sm.State, error) {
+func loadState(dbName string, cacheSize int, historySize int64) (*sm.State, error) {
 	// memory backed case, just for testing
 	if dbName == "" {
 		tree := iavl.NewVersionedTree(0, dbm.NewMemDB())

app/val_test.go

@@ -17,8 +17,8 @@ import (
 //-----------------------------------
 // Test cases start here
 
-func randPower() uint64 {
-	return uint64(cmn.RandInt()%50 + 60)
+func randPower() int64 {
+	return int64(cmn.RandInt()%50 + 60)
 }
 
 func makeVal() *abci.Validator {
@@ -79,7 +79,7 @@ func TestEndBlock(t *testing.T) {
 			tx := base.ValChangeTx{c}.Wrap()
 			txBytes := wire.BinaryBytes(tx)
 			res := app.DeliverTx(txBytes)
-			require.True(res.Code.IsOK(), "%#v", res)
+			require.True(res.IsOK(), "%#v", res)
 		}
 		diff := app.EndBlock(abci.RequestEndBlock{app.height})
 		// TODO: don't care about order here...

client/commands/commits/export.go

@@ -34,7 +34,7 @@ func exportCommit(cmd *cobra.Command, args []string) error {
 
 	// load the seed as specified
 	trust, _ := commands.GetProviders()
-	h := viper.GetInt(heightFlag)
+	h := int64(viper.GetInt(heightFlag))
 	hash := viper.GetString(hashFlag)
 	fc, err := loadCommit(trust, h, hash, "")
 	if err != nil {

client/commands/commits/show.go

@@ -37,7 +37,7 @@ func init() {
 	RootCmd.AddCommand(showCmd)
 }
 
-func loadCommit(p lite.Provider, h int, hash, file string) (fc lite.FullCommit, err error) {
+func loadCommit(p lite.Provider, h int64, hash, file string) (fc lite.FullCommit, err error) {
 	// load the commit from the proper place
 	if h != 0 {
 		fc, err = p.GetByHeight(h)
@@ -59,7 +59,7 @@ func loadCommit(p lite.Provider, h int, hash, file string) (fc lite.FullCommit,
 func showCommit(cmd *cobra.Command, args []string) error {
 	trust, _ := commands.GetProviders()
 
-	h := viper.GetInt(heightFlag)
+	h := int64(viper.GetInt(heightFlag))
 	hash := viper.GetString(hashFlag)
 	file := viper.GetString(fileFlag)
 	fc, err := loadCommit(trust, h, hash, file)

client/commands/commits/update.go

@@ -29,7 +29,7 @@ func updateCommit(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	h := viper.GetInt(heightFlag)
+	h := int64(viper.GetInt(heightFlag))
 	var fc lite.FullCommit
 	if h <= 0 {
 		// get the lastest from our source

client/commands/query/get.go

@@ -27,7 +27,7 @@ import (
 // It will try to get the proof for the given key.  If it is successful,
 // it will return the height and also unserialize proof.Data into the data
 // argument (so pass in a pointer to the appropriate struct)
-func GetParsed(key []byte, data interface{}, height int, prove bool) (uint64, error) {
+func GetParsed(key []byte, data interface{}, height int64, prove bool) (int64, error) {
 	bs, h, err := Get(key, height, prove)
 	if err != nil {
 		return 0, err
@@ -47,16 +47,19 @@ func GetParsed(key []byte, data interface{}, height int, prove bool) (uint64, er
 // we just repeat whatever any (potentially malicious) node gives us.
 // Only use that if you are running the full node yourself,
 // and it is localhost or you have a secure connection (not HTTP)
-func Get(key []byte, height int, prove bool) (data.Bytes, uint64, error) {
+func Get(key []byte, height int64, prove bool) (data.Bytes, int64, error) {
 	if height < 0 {
 		return nil, 0, fmt.Errorf("Height cannot be negative")
 	}
 
 	if !prove {
 		node := commands.GetNode()
 		resp, err := node.ABCIQueryWithOptions("/key", key,
-			rpcclient.ABCIQueryOptions{Trusted: true, Height: uint64(height)})
-		return data.Bytes(resp.Value), resp.Height, err
+			rpcclient.ABCIQueryOptions{Trusted: true, Height: int64(height)})
+		if resp == nil {
+			return nil, height, err
+		}
+		return data.Bytes(resp.Response.Value), resp.Response.Height, err
 	}
 	val, h, _, err := GetWithProof(key, height)
 	return val, h, err
@@ -65,7 +68,7 @@ func Get(key []byte, height int, prove bool) (data.Bytes, uint64, error) {
 // GetWithProof returns the values stored under a given key at the named
 // height as in Get.  Additionally, it will return a validated merkle
 // proof for the key-value pair if it exists, and all checks pass.
-func GetWithProof(key []byte, height int) (data.Bytes, uint64, iavl.KeyProof, error) {
+func GetWithProof(key []byte, height int64) (data.Bytes, int64, iavl.KeyProof, error) {
 	node := commands.GetNode()
 	cert, err := commands.GetCertifier()
 	if err != nil {
@@ -93,19 +96,19 @@ func ParseHexKey(args []string, argname string) ([]byte, error) {
 }
 
 // GetHeight reads the viper config for the query height
-func GetHeight() int {
-	return viper.GetInt(FlagHeight)
+func GetHeight() int64 {
+	return int64(viper.GetInt(FlagHeight))
 }
 
 type proof struct {
-	Height uint64      `json:"height"`
+	Height int64       `json:"height"`
 	Data   interface{} `json:"data"`
 }
 
 // FoutputProof writes the output of wrapping height and info
 // in the form {"data": <the_data>, "height": <the_height>}
 // to the provider io.Writer
-func FoutputProof(w io.Writer, v interface{}, height uint64) error {
+func FoutputProof(w io.Writer, v interface{}, height int64) error {
 	wrap := &proof{height, v}
 	blob, err := data.ToJSON(wrap)
 	if err != nil {
@@ -118,6 +121,6 @@ func FoutputProof(w io.Writer, v interface{}, height uint64) error {
 // OutputProof prints the proof to stdout
 // reuse this for printing proofs and we should enhance this for text/json,
 // better presentation of height
-func OutputProof(data interface{}, height uint64) error {
+func OutputProof(data interface{}, height int64) error {
 	return FoutputProof(os.Stdout, data, height)
 }

client/commands/query/tx.go

@@ -67,7 +67,7 @@ func txQueryCmd(cmd *cobra.Command, args []string) error {
 }
 
 // showTx parses anything that was previously registered as sdk.Tx
-func showTx(h uint64, tx types.Tx) error {
+func showTx(h int64, tx types.Tx) error {
 	var info sdk.Tx
 	err := wire.ReadBinaryBytes(tx, &info)
 	if err != nil {

client/commands/rpc/helpers.go

@@ -25,10 +25,10 @@ func init() {
 
 func runWait(cmd *cobra.Command, args []string) error {
 	c := commands.GetNode()
-	h := viper.GetInt(FlagHeight)
+	h := int64(viper.GetInt(FlagHeight))
 	if h == -1 {
 		// read from delta
-		d := viper.GetInt(FlagDelta)
+		d := int64(viper.GetInt(FlagDelta))
 		if d == -1 {
 			return errors.New("Must set --height or --delta")
 		}

client/commands/rpc/secure.go

@@ -26,7 +26,7 @@ func runBlock(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	h := viper.GetInt(FlagHeight)
+	h := int64(viper.GetInt(FlagHeight))
 	block, err := c.Block(&h)
 	if err != nil {
 		return err
@@ -46,7 +46,7 @@ func runCommit(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	h := viper.GetInt(FlagHeight)
+	h := int64(viper.GetInt(FlagHeight))
 	commit, err := c.Commit(&h)
 	if err != nil {
 		return err
@@ -66,8 +66,8 @@ func runHeaders(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	min := viper.GetInt(FlagMin)
-	max := viper.GetInt(FlagMax)
+	min := int64(viper.GetInt(FlagMin))
+	max := int64(viper.GetInt(FlagMax))
 	headers, err := c.BlockchainInfo(min, max)
 	if err != nil {
 		return err