weave: package improvements

abci.go

@@ -1,6 +1,8 @@
 package weave
 
 import (
+	"fmt"
+
 	"github.com/iov-one/weave/coin"
 	"github.com/iov-one/weave/errors"
 	abci "github.com/tendermint/tendermint/abci/types"
@@ -62,7 +64,7 @@ func (d DeliverResult) ToABCI() abci.ResponseDeliverTx {
 // ParseDeliverOrError is the inverse of DeliverOrError
 // It will parse back the abci response to return our internal format, or return an error on failed tx
 func ParseDeliverOrError(res abci.ResponseDeliverTx) (*DeliverResult, error) {
-	if res.Code != 0 {
+	if res.Code != errors.SuccessABCICode {
 		err := errors.ABCIError(res.Code, res.Log)
 		return nil, err
 	}
@@ -120,8 +122,8 @@ type TickResult struct {
 func DeliverTxError(err error, debug bool) abci.ResponseDeliverTx {
 	err = errors.Redact(err, debug)
 	code, log := errors.ABCIInfo(err, debug)
-	if code != 0 {
-		log = "cannot deliver tx: " + log
+	if code != errors.SuccessABCICode {
+		log = fmt.Sprintf("cannot deliver tx: %s", log)
 	}
 	return abci.ResponseDeliverTx{
 		Code: code,
@@ -135,8 +137,8 @@ func DeliverTxError(err error, debug bool) abci.ResponseDeliverTx {
 func CheckTxError(err error, debug bool) abci.ResponseCheckTx {
 	err = errors.Redact(err, debug)
 	code, log := errors.ABCIInfo(err, debug)
-	if code != 0 {
-		log = "cannot check tx: " + log
+	if code != errors.SuccessABCICode {
+		log = fmt.Sprintf("cannot check tx: %s", log)
 	}
 	return abci.ResponseCheckTx{
 		Code: code,

store.go

@@ -172,12 +172,11 @@ type CommitKVStore interface {
 	// LatestVersion returns info on the latest version saved to disk
 	LatestVersion() (CommitID, error)
 
-	// ?????
 	// LoadVersion loads a specific persisted version.  When you load an old version, or
 	// when the last commit attempt didn't complete, the next commit after
 	// loading must be idempotent (return the same commit id).  Otherwise the
 	// behavior is undefined.
-	// LoadVersion(ver int64) error
+	LoadVersion(ver int64) error
 }
 
 // CommitID contains the tree version number and its merkle root.

store/iavl/adapter.go

@@ -90,6 +90,15 @@ func (s CommitStore) LoadLatestVersion() error {
 	return err
 }
 
+// LoadVersion loads a specific persisted version.  When you load an old version, or
+// when the last commit attempt didn't complete, the next commit after
+// loading must be idempotent (return the same commit id).  Otherwise the
+// behavior is undefined.
+func (s CommitStore) LoadVersion(version int64) error {
+	_, err := s.tree.LoadVersion(version)
+	return err
+}
+
 // LatestVersion returns info on the latest version saved to disk
 func (s CommitStore) LatestVersion() (store.CommitID, error) {
 	c := store.CommitID{

version.go

@@ -1,13 +1,4 @@
 package weave
 
-// Maj is the major version number (updated on breaking release)
-const Maj = 0
-
-// Min is the minor version number (updated on minor releases)
-const Min = 7
-
-// Fix is the patch number (updated on bugfix releases)
-const Fix = 0
-
 // Version should be set by build flags: `git describe --tags`
 var Version = "please set in makefile"