Skip to content

Commit

Permalink
record block id in transaction result correctly (#5084)
Browse files Browse the repository at this point in the history 
## Motivation
block id is not updated in transaction result correctly prior to updating db.
as a result, transactions have empty block id recorded.
  • Loading branch information
@countvonzero
countvonzero committed Sep 27, 2023
1 parent 878ed5d commit a8ab1b0
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 40 deletions.
4 changes: 2 additions & 2 deletions mesh/executor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ func (e *Executor) checkOrder(lid types.LayerID) error {
}

func updateResults(bid types.BlockID, executed []types.TransactionWithResult) {
for _, tx := range executed {
tx.Block = bid
for i := range executed {
executed[i].Block = bid
}
}

Expand Down
88 changes: 50 additions & 38 deletions mesh/executor_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,9 @@ func TestExecutor_Execute(t *testing.T) {
errInconceivable := errors.New("inconceivable")
t.Run("vm failure", func(t *testing.T) {
te.mvm.EXPECT().Apply(vm.ApplyContext{Layer: block.LayerIndex}, gomock.Any(), expRewards).DoAndReturn(
func(_ vm.ApplyContext, got []types.Transaction, _ []types.CoinbaseReward) ([]types.Transaction, []types.TransactionWithResult, error) {
tids := make([]types.TransactionID, 0, len(got))
for _, tx := range got {
func(_ vm.ApplyContext, gotTxs []types.Transaction, _ []types.CoinbaseReward) ([]types.Transaction, []types.TransactionWithResult, error) {
tids := make([]types.TransactionID, 0, len(gotTxs))
for _, tx := range gotTxs {
tids = append(tids, tx.ID)
}
require.Equal(t, block.TxIDs, tids)
Expand All @@ -175,43 +175,49 @@ func TestExecutor_Execute(t *testing.T) {
var ineffective []types.Transaction
t.Run("conservative cache failure", func(t *testing.T) {
te.mvm.EXPECT().Apply(vm.ApplyContext{Layer: block.LayerIndex}, gomock.Any(), expRewards).DoAndReturn(
func(_ vm.ApplyContext, got []types.Transaction, _ []types.CoinbaseReward) ([]types.Transaction, []types.TransactionWithResult, error) {
tids := make([]types.TransactionID, 0, len(got))
for _, tx := range got {
func(_ vm.ApplyContext, gotTxs []types.Transaction, _ []types.CoinbaseReward) ([]types.Transaction, []types.TransactionWithResult, error) {
tids := make([]types.TransactionID, 0, len(gotTxs))
for _, tx := range gotTxs {
tids = append(tids, tx.ID)
}
require.Equal(t, block.TxIDs, tids)
// make first tx ineffective
ineffective = got[:1]
executed = makeResults(block.LayerIndex, got[1:]...)
ineffective = gotTxs[:1]
executed = makeResults(block.LayerIndex, gotTxs[1:]...)
return ineffective, executed, nil
})
te.mcs.EXPECT().UpdateCache(gomock.Any(), block.LayerIndex, block.ID(), gomock.Any(), gomock.Any()).DoAndReturn(
func(_ context.Context, _ types.LayerID, _ types.BlockID, gotE []types.TransactionWithResult, gotI []types.Transaction) error {
require.Equal(t, executed, gotE)
require.Equal(t, ineffective, gotI)
func(_ context.Context, _ types.LayerID, gotBid types.BlockID, gotExecuted []types.TransactionWithResult, gotIneffective []types.Transaction) error {
require.Equal(t, executed, gotExecuted)
require.Equal(t, ineffective, gotIneffective)
for _, tr := range executed {
require.Equal(t, tr.Block, gotBid)
}
return errInconceivable
})
require.ErrorIs(t, te.exec.Execute(context.Background(), block.LayerIndex, block), errInconceivable)
})

t.Run("applied block", func(t *testing.T) {
te.mvm.EXPECT().Apply(vm.ApplyContext{Layer: block.LayerIndex}, gomock.Any(), expRewards).DoAndReturn(
func(_ vm.ApplyContext, got []types.Transaction, _ []types.CoinbaseReward) ([]types.Transaction, []types.TransactionWithResult, error) {
tids := make([]types.TransactionID, 0, len(got))
for _, tx := range got {
func(_ vm.ApplyContext, gotTxs []types.Transaction, _ []types.CoinbaseReward) ([]types.Transaction, []types.TransactionWithResult, error) {
tids := make([]types.TransactionID, 0, len(gotTxs))
for _, tx := range gotTxs {
tids = append(tids, tx.ID)
}
require.Equal(t, block.TxIDs, tids)
// make first tx ineffective
ineffective = got[:1]
executed = makeResults(block.LayerIndex, got[1:]...)
ineffective = gotTxs[:1]
executed = makeResults(block.LayerIndex, gotTxs[1:]...)
return ineffective, executed, nil
})
te.mcs.EXPECT().UpdateCache(gomock.Any(), block.LayerIndex, block.ID(), gomock.Any(), gomock.Any()).DoAndReturn(
func(_ context.Context, _ types.LayerID, _ types.BlockID, gotE []types.TransactionWithResult, gotI []types.Transaction) error {
require.Equal(t, executed, gotE)
require.Equal(t, ineffective, gotI)
func(_ context.Context, _ types.LayerID, gotBid types.BlockID, gotExecuted []types.TransactionWithResult, gotIneffective []types.Transaction) error {
require.Equal(t, executed, gotExecuted)
require.Equal(t, ineffective, gotIneffective)
for _, tr := range gotExecuted {
require.Equal(t, tr.Block, gotBid)
}
return nil
})
te.mvm.EXPECT().GetStateRoot()
Expand Down Expand Up @@ -274,9 +280,9 @@ func TestExecutor_ExecuteOptimistic(t *testing.T) {
errInconceivable := errors.New("inconceivable")
t.Run("vm failure", func(t *testing.T) {
te.mvm.EXPECT().Apply(vm.ApplyContext{Layer: lid}, gomock.Any(), expRewards).DoAndReturn(
func(_ vm.ApplyContext, got []types.Transaction, _ []types.CoinbaseReward) ([]types.Transaction, []types.TransactionWithResult, error) {
gotTids := make([]types.TransactionID, 0, len(got))
for _, tx := range got {
func(_ vm.ApplyContext, gotTxs []types.Transaction, _ []types.CoinbaseReward) ([]types.Transaction, []types.TransactionWithResult, error) {
gotTids := make([]types.TransactionID, 0, len(gotTxs))
for _, tx := range gotTxs {
gotTids = append(gotTids, tx.ID)
}
require.Equal(t, tids, gotTids)
Expand All @@ -291,15 +297,15 @@ func TestExecutor_ExecuteOptimistic(t *testing.T) {
var ineffective []types.Transaction
t.Run("conservative cache failure", func(t *testing.T) {
te.mvm.EXPECT().Apply(vm.ApplyContext{Layer: lid}, gomock.Any(), expRewards).DoAndReturn(
func(_ vm.ApplyContext, got []types.Transaction, _ []types.CoinbaseReward) ([]types.Transaction, []types.TransactionWithResult, error) {
gotTids := make([]types.TransactionID, 0, len(got))
for _, tx := range got {
func(_ vm.ApplyContext, gotTxs []types.Transaction, _ []types.CoinbaseReward) ([]types.Transaction, []types.TransactionWithResult, error) {
gotTids := make([]types.TransactionID, 0, len(gotTxs))
for _, tx := range gotTxs {
gotTids = append(gotTids, tx.ID)
}
require.Equal(t, tids, gotTids)
// make first tx ineffective
ineffective = got[:1]
executed = makeResults(lid, got[1:]...)
ineffective = gotTxs[:1]
executed = makeResults(lid, gotTxs[1:]...)
return ineffective, executed, nil
})
expBlock := &types.Block{
Expand All @@ -312,9 +318,12 @@ func TestExecutor_ExecuteOptimistic(t *testing.T) {
}
expBlock.Initialize()
te.mcs.EXPECT().UpdateCache(gomock.Any(), lid, expBlock.ID(), gomock.Any(), gomock.Any()).DoAndReturn(
func(_ context.Context, _ types.LayerID, _ types.BlockID, gotE []types.TransactionWithResult, gotI []types.Transaction) error {
require.Equal(t, executed, gotE)
require.Equal(t, ineffective, gotI)
func(_ context.Context, _ types.LayerID, gotBid types.BlockID, gotExecuted []types.TransactionWithResult, gotIneffective []types.Transaction) error {
require.Equal(t, executed, gotExecuted)
require.Equal(t, ineffective, gotIneffective)
for _, tr := range gotExecuted {
require.Equal(t, tr.Block, gotBid)
}
return errInconceivable
})
block, err := te.exec.ExecuteOptimistic(context.Background(), lid, tickHeight, rewards, tids)
Expand All @@ -324,15 +333,15 @@ func TestExecutor_ExecuteOptimistic(t *testing.T) {

t.Run("executed in situ", func(t *testing.T) {
te.mvm.EXPECT().Apply(vm.ApplyContext{Layer: lid}, gomock.Any(), expRewards).DoAndReturn(
func(_ vm.ApplyContext, got []types.Transaction, _ []types.CoinbaseReward) ([]types.Transaction, []types.TransactionWithResult, error) {
gotTids := make([]types.TransactionID, 0, len(got))
for _, tx := range got {
func(_ vm.ApplyContext, gotTxs []types.Transaction, _ []types.CoinbaseReward) ([]types.Transaction, []types.TransactionWithResult, error) {
gotTids := make([]types.TransactionID, 0, len(gotTxs))
for _, tx := range gotTxs {
gotTids = append(gotTids, tx.ID)
}
require.Equal(t, tids, gotTids)
// make first tx ineffective
ineffective = got[:1]
executed = makeResults(lid, got[1:]...)
ineffective = gotTxs[:1]
executed = makeResults(lid, gotTxs[1:]...)
return ineffective, executed, nil
})
expBlock := &types.Block{
Expand All @@ -345,9 +354,12 @@ func TestExecutor_ExecuteOptimistic(t *testing.T) {
}
expBlock.Initialize()
te.mcs.EXPECT().UpdateCache(gomock.Any(), expBlock.LayerIndex, expBlock.ID(), gomock.Any(), gomock.Any()).DoAndReturn(
func(_ context.Context, _ types.LayerID, _ types.BlockID, gotE []types.TransactionWithResult, gotI []types.Transaction) error {
require.Equal(t, executed, gotE)
require.Equal(t, ineffective, gotI)
func(_ context.Context, _ types.LayerID, gotBid types.BlockID, gotExecuted []types.TransactionWithResult, gotIneffective []types.Transaction) error {
require.Equal(t, executed, gotExecuted)
require.Equal(t, ineffective, gotIneffective)
for _, tr := range gotExecuted {
require.Equal(t, tr.Block, gotBid)
}
return nil
})
te.mvm.EXPECT().GetStateRoot()
Expand Down

0 comments on commit a8ab1b0

Please sign in to comment.