This commit is contained in:
Łukasz Magiera 2020-08-13 10:20:41 +02:00
parent f0d32f2c01
commit 936d861df5
5 changed files with 13 additions and 20 deletions

View File

@ -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

View File

@ -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 {

View File

@ -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
}
}

View File

@ -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
}
}

View File

@ -95,10 +95,9 @@ var actorSetAddrsCmd = &cli.Command{
},
}
var actorWithdrawCmd = &cli.Command{
Name: "withdraw",
Usage: "withdraw available balance",
Name: "withdraw",
Usage: "withdraw available balance",
ArgsUsage: "[amount (FIL)]",
Action: func(cctx *cli.Context) error {
nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)