diff --git a/chain/events/state/diff_adt.go b/chain/events/state/diff_adt.go index 9e66eede3..1b921dd9e 100644 --- a/chain/events/state/diff_adt.go +++ b/chain/events/state/diff_adt.go @@ -41,7 +41,7 @@ func DiffAdtArray(preArr, curArr *adt.Array, out AdtArrayDiff) error { } // no modification - if !bytes.Equal(prevVal.Raw,curVal.Raw) { + if !bytes.Equal(prevVal.Raw, curVal.Raw) { if err := out.Modify(uint64(i), prevVal, curVal); err != nil { return err } @@ -95,13 +95,12 @@ func DiffAdtMap(preMap, curMap *adt.Map, out AdtMapDiff) error { } // no modification - if !bytes.Equal(prevVal.Raw,curVal.Raw) { + if !bytes.Equal(prevVal.Raw, curVal.Raw) { if err := out.Modify(key, prevVal, curVal); err != nil { return err } } - return curMap.Delete(k) }); err != nil { return err diff --git a/chain/events/state/diff_adt_test.go b/chain/events/state/diff_adt_test.go index a430d2de7..56a03bf33 100644 --- a/chain/events/state/diff_adt_test.go +++ b/chain/events/state/diff_adt_test.go @@ -71,7 +71,6 @@ func TestDiffAdtArray(t *testing.T) { assert.EqualValues(t, []byte{1}, changes.Removed[1].val) } - func TestDiffAdtMap(t *testing.T) { ctxstoreA := newContextStore() ctxstoreB := newContextStore() @@ -128,14 +127,13 @@ func TestDiffAdtMap(t *testing.T) { } type TestDiffMap struct { - Added []adtMapDiffResult + Added []adtMapDiffResult Modified []TestAdtMapDiffModified - Removed []adtMapDiffResult + Removed []adtMapDiffResult } var _ AdtMapDiff = &TestDiffMap{} - func (t *TestDiffMap) AsKey(key string) (adt.Keyer, error) { k, err := adt.ParseUIntKey(key) if err != nil { @@ -218,7 +216,7 @@ type adtMapDiffResult struct { type TestAdtMapDiffModified struct { From adtMapDiffResult - To adtMapDiffResult + To adtMapDiffResult } type adtArrayDiffResult struct { diff --git a/chain/events/state/predicates.go b/chain/events/state/predicates.go index 544ff7b14..bf85f1f1a 100644 --- a/chain/events/state/predicates.go +++ b/chain/events/state/predicates.go @@ -649,22 +649,20 @@ type AddressPair struct { } type InitActorAddressChanges struct { - Added []AddressPair + Added []AddressPair Modified []AddressChange - Removed []AddressPair + Removed []AddressPair } type AddressChange struct { From AddressPair - To AddressPair + To AddressPair } type DiffInitActorStateFunc func(ctx context.Context, oldState *init_.State, newState *init_.State) (changed bool, user UserData, err error) - - func (i *InitActorAddressChanges) AsKey(key string) (adt.Keyer, error) { - addr , err := address.NewFromBytes([]byte(key)) + addr, err := address.NewFromBytes([]byte(key)) if err != nil { return nil, err } @@ -720,7 +718,7 @@ func (i *InitActorAddressChanges) Modify(key string, from, to *typegen.Deferred) ID: fromIDAddr, PK: pkAddr, }, - To: AddressPair{ + To: AddressPair{ ID: toIDAddr, PK: pkAddr, }, @@ -786,4 +784,3 @@ func (sp *StatePredicates) OnAddressMapChange() DiffInitActorStateFunc { return true, addressChanges, nil } } - diff --git a/cli/net.go b/cli/net.go index c3928a5b8..7a2474bf4 100644 --- a/cli/net.go +++ b/cli/net.go @@ -205,8 +205,8 @@ var netFindPeer = &cli.Command{ } var NetReachability = &cli.Command{ - Name: "reachability", - Usage: "Print information about reachability from the internet", + Name: "reachability", + Usage: "Print information about reachability from the internet", Action: func(cctx *cli.Context) error { api, closer, err := GetAPI(cctx) if err != nil { diff --git a/cmd/lotus-chainwatch/processor/common_actors.go b/cmd/lotus-chainwatch/processor/common_actors.go index b2e86ddc2..3fbdbf170 100644 --- a/cmd/lotus-chainwatch/processor/common_actors.go +++ b/cmd/lotus-chainwatch/processor/common_actors.go @@ -176,7 +176,7 @@ func (p Processor) storeActorAddresses(ctx context.Context, actors map[cid.Cid]A for _, updates := range addressesToUpdate { if _, err := updateTx.Exec( fmt.Sprintf("update id_address_map set id=%s, address=%s where id=%s and address=%s", updates.New.ID, updates.New.PK, updates.Old.ID, updates.Old.PK), - ); err != nil { + ); err != nil { return err } }