From 1f62c07789535980e848fd805c8165dafd04a5c7 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Mon, 18 Jan 2021 17:10:14 -0800 Subject: [PATCH] add back logging --- chain/state/statetree.go | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/chain/state/statetree.go b/chain/state/statetree.go index d7990b9b8..46a13ccc6 100644 --- a/chain/state/statetree.go +++ b/chain/state/statetree.go @@ -210,29 +210,36 @@ func LoadStateTree(cst cbor.IpldStore, c cid.Cid) (*StateTree, error) { store := adt.WrapStore(context.TODO(), cst) - var hamt adt.Map + var ( + hamt adt.Map + err error + ) switch root.Version { case types.StateTreeVersion0: - tree, err := states0.LoadTree(store, root.Actors) - if err != nil { - return nil, xerrors.Errorf("failed to load state tree: %w", err) + var tree *states0.Tree + tree, err = states0.LoadTree(store, root.Actors) + if tree != nil { + hamt = tree.Map } - hamt = tree.Map case types.StateTreeVersion1: - tree, err := states2.LoadTree(store, root.Actors) - if err != nil { - return nil, xerrors.Errorf("failed to load state tree: %w", err) + var tree *states2.Tree + tree, err = states2.LoadTree(store, root.Actors) + if tree != nil { + hamt = tree.Map } - hamt = tree.Map case types.StateTreeVersion2: - tree, err := states3.LoadTree(store, root.Actors) - if err != nil { - return nil, xerrors.Errorf("failed to load state tree: %w", err) + var tree *states3.Tree + tree, err = states3.LoadTree(store, root.Actors) + if tree != nil { + hamt = tree.Map } - hamt = tree.Map default: return nil, xerrors.Errorf("unsupported state tree version: %d", root.Version) } + if err != nil { + log.Errorf("failed to load state tree: %s", err) + return nil, xerrors.Errorf("failed to load state tree: %w", err) + } s := &StateTree{ root: hamt,