Clean up state.State as we only support persistence
This commit is contained in:
parent
4855b3c9d9
commit
fbe88ee275
|
@ -5,19 +5,17 @@ import "github.com/tendermint/iavl"
|
|||
// State represents the app states, separating the commited state (for queries)
|
||||
// from the working state (for CheckTx and AppendTx)
|
||||
type State struct {
|
||||
committed *Bonsai
|
||||
deliverTx SimpleDB
|
||||
checkTx SimpleDB
|
||||
persistent bool
|
||||
committed *Bonsai
|
||||
deliverTx SimpleDB
|
||||
checkTx SimpleDB
|
||||
}
|
||||
|
||||
func NewState(tree *iavl.VersionedTree) *State {
|
||||
base := NewBonsai(tree)
|
||||
return &State{
|
||||
committed: base,
|
||||
deliverTx: base.Checkpoint(),
|
||||
checkTx: base.Checkpoint(),
|
||||
persistent: true,
|
||||
committed: base,
|
||||
deliverTx: base.Checkpoint(),
|
||||
checkTx: base.Checkpoint(),
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -45,14 +43,6 @@ func (s State) LatestHash() []byte {
|
|||
return s.committed.Tree.Hash()
|
||||
}
|
||||
|
||||
// BatchSet is used for some weird magic in storing the new height
|
||||
func (s *State) BatchSet(key, value []byte) {
|
||||
if s.persistent {
|
||||
// This is in the batch with the Save, but not in the tree
|
||||
s.committed.Tree.BatchSet(key, value)
|
||||
}
|
||||
}
|
||||
|
||||
// Commit save persistent nodes to the database and re-copies the trees
|
||||
func (s *State) Commit(version uint64) ([]byte, error) {
|
||||
// commit (if we didn't do hash earlier)
|
||||
|
@ -62,15 +52,11 @@ func (s *State) Commit(version uint64) ([]byte, error) {
|
|||
}
|
||||
|
||||
var hash []byte
|
||||
if s.persistent {
|
||||
if s.committed.Tree.Size() > 0 || s.committed.Tree.LatestVersion() > 0 {
|
||||
hash, err = s.committed.Tree.SaveVersion(version)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if s.committed.Tree.Size() > 0 || s.committed.Tree.LatestVersion() > 0 {
|
||||
hash, err = s.committed.Tree.SaveVersion(version)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
} else {
|
||||
hash = s.committed.Tree.Hash()
|
||||
}
|
||||
|
||||
s.deliverTx = s.committed.Checkpoint()
|
||||
|
|
Loading…
Reference in New Issue