Skip to content

Commit

Permalink
polish(errors): better state tree errors
Browse files Browse the repository at this point in the history
  • Loading branch information
frrist committed Jul 29, 2021
1 parent 5be5f25 commit 9cd689d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion chain/state/statetree.go
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ func LoadStateTree(cst cbor.IpldStore, c cid.Cid) (*StateTree, error) {
}
if err != nil {
log.Errorf("failed to load state tree: %s", err)
return nil, xerrors.Errorf("failed to load state tree: %w", err)
return nil, xerrors.Errorf("failed to load state tree %s: %w", c.String(), err)
}

s := &StateTree{
Expand Down
6 changes: 3 additions & 3 deletions chain/stmgr/stmgr.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ func (sm *StateManager) ResolveToKeyAddress(ctx context.Context, addr address.Ad
// First try to resolve the actor in the parent state, so we don't have to compute anything.
tree, err := state.LoadStateTree(cst, ts.ParentState())
if err != nil {
return address.Undef, xerrors.Errorf("failed to load parent state tree: %w", err)
return address.Undef, xerrors.Errorf("failed to load parent state tree at tipset %s: %w", ts.Parents().String(), err)
}

resolved, err := vm.ResolveToKeyAddr(tree, cst, addr)
Expand All @@ -232,12 +232,12 @@ func (sm *StateManager) ResolveToKeyAddress(ctx context.Context, addr address.Ad
// If that fails, compute the tip-set and try again.
st, _, err := sm.TipSetState(ctx, ts)
if err != nil {
return address.Undef, xerrors.Errorf("resolve address failed to get tipset state: %w", err)
return address.Undef, xerrors.Errorf("resolve address failed to get tipset %s state: %w", ts.String(), err)
}

tree, err = state.LoadStateTree(cst, st)
if err != nil {
return address.Undef, xerrors.Errorf("failed to load state tree")
return address.Undef, xerrors.Errorf("failed to load state tree at tipset %s: %w", ts.String(), err)
}

return vm.ResolveToKeyAddr(tree, cst, addr)
Expand Down
2 changes: 1 addition & 1 deletion chain/store/messages.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func (cs *ChainStore) BlockMsgsForTipset(ts *types.TipSet) ([]BlockMessages, err
cst := cbor.NewCborStore(cs.stateBlockstore)
st, err := state.LoadStateTree(cst, ts.Blocks()[0].ParentStateRoot)
if err != nil {
return nil, xerrors.Errorf("failed to load state tree")
return nil, xerrors.Errorf("failed to load state tree at tipset %s: %w", ts.String(), err)
}

selectMsg := func(m *types.Message) (bool, error) {
Expand Down

0 comments on commit 9cd689d

Please sign in to comment.