Redefine view

action/protocol/staking/bucket_pool_test.go

@@ -79,7 +79,6 @@ func TestBucketPool(t *testing.T) {
 	}
 
 	view, _, err := CreateBaseView(sm, false)
-	view.contractsStake = &contractStakeView{}
 	r.NoError(err)
 	r.NoError(sm.WriteView(_protocolID, view))
 	pool = view.bucketPool

action/protocol/staking/candidate_statereader.go

@@ -176,9 +176,8 @@ func CreateBaseView(sr protocol.StateReader, enableSMStorage bool) (*ViewData, u
 	}
 
 	return &ViewData{
-		candCenter:     center,
-		bucketPool:     pool,
-		contractsStake: &contractStakeView{},
+		candCenter: center,
+		bucketPool: pool,
 	}, height, nil
 }
 

action/protocol/staking/viewdata.go

@@ -10,10 +10,9 @@ import (
 	"math/big"
 
 	"github.com/iotexproject/iotex-address/address"
-	"github.com/pkg/errors"
-
 	"github.com/iotexproject/iotex-core/v2/action"
 	"github.com/iotexproject/iotex-core/v2/action/protocol"
+	"github.com/pkg/errors"
 )
 
 type (
@@ -22,7 +21,6 @@ type (
 		Clone() ContractStakeView
 		CreatePreStates(ctx context.Context) error
 		Handle(ctx context.Context, receipt *action.Receipt) error
-		Commit()
 		BucketsByCandidate(ownerAddr address.Address) ([]*VoteBucket, error)
 	}
 	// ViewData is the data that need to be stored in protocol's view
@@ -81,7 +79,6 @@ func (v *ViewData) Commit(ctx context.Context, sr protocol.StateReader) error {
 	if err := v.bucketPool.Commit(sr); err != nil {
 		return err
 	}
-	v.contractsStake.Commit()
 	v.snapshots = []Snapshot{}
 
 	return nil
@@ -93,13 +90,15 @@ func (v *ViewData) IsDirty() bool {
 
 func (v *ViewData) Snapshot() int {
 	snapshot := len(v.snapshots)
+	clone := v.contractsStake.Clone()
 	v.snapshots = append(v.snapshots, Snapshot{
 		size:           v.candCenter.size,
 		changes:        v.candCenter.change.size(),
 		amount:         new(big.Int).Set(v.bucketPool.total.amount),
 		count:          v.bucketPool.total.count,
-		contractsStake: v.contractsStake.Clone(),
+		contractsStake: v.contractsStake,
 	})
+	v.contractsStake = clone
 	return snapshot
 }
 
@@ -175,15 +174,3 @@ func (csv *contractStakeView) Handle(ctx context.Context, receipt *action.Receip
 	}
 	return nil
 }
-
-func (csv *contractStakeView) Commit() {
-	if csv.v1 != nil {
-		csv.v1.Commit()
-	}
-	if csv.v2 != nil {
-		csv.v2.Commit()
-	}
-	if csv.v3 != nil {
-		csv.v3.Commit()
-	}
-}

action/protocol/staking/viewdata_test.go

@@ -6,10 +6,9 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	"github.com/stretchr/testify/require"
-
 	"github.com/iotexproject/iotex-core/v2/test/identityset"
 	"github.com/iotexproject/iotex-core/v2/test/mock/mock_chainmanager"
+	"github.com/stretchr/testify/require"
 )
 
 func TestViewData_Clone(t *testing.T) {
@@ -62,10 +61,9 @@ func prepareViewData(t *testing.T) (*ViewData, int) {
 		},
 	}
 	viewData := &ViewData{
-		candCenter:     candCenter,
-		bucketPool:     bucketPool,
-		snapshots:      []Snapshot{},
-		contractsStake: &contractStakeView{},
+		candCenter: candCenter,
+		bucketPool: bucketPool,
+		snapshots:  []Snapshot{},
 	}
 	return viewData, viewData.Snapshot()
 }

blockindex/contractstaking/bucket_info.go

@@ -39,8 +39,8 @@ func (bi *bucketInfo) Deserialize(b []byte) error {
 	return bi.loadProto(&m)
 }
 
-// clone clones the bucket info
-func (bi *bucketInfo) clone() *bucketInfo {
+// Clone clones the bucket info
+func (bi *bucketInfo) Clone() *bucketInfo {
 	delegate := bi.Delegate
 	if delegate != nil {
 		delegate, _ = address.FromBytes(delegate.Bytes())