Remove aggregated branches #2070

jonastheis · 2022-02-22T20:07:30Z

Description of change

To simplify the concepts of the BranchDAG, we remove the AggregatedBranches from the code base and just carry BranchIDs in every object (lots of duplicate branches might be stored but due to merge to master it should be limited and go back to master branch quickly). Later on we can introduce a storage optimization aka CompressedBranchIDs to handle deduplication on the storage layer itself. In that way the interface of Message, Transaction and Output does not change regardless of how the branch IDs are actually stored.

Type of change

Breaking change (fix or feature that would cause existing functionality to not work as expected)

… objects

packages/jsonmodels/ledgerstate.go

plugins/webapi/ledgerstate/plugin.go

plugins/dashboard/conflicts_livefeed.go

plugins/dagsvisualizer/visualizer.go

packages/tangle/approvalweightmanager.go

packages/tangle/ledgerstate.go

packages/ledgerstate/branch.go

packages/ledgerstate/branch_dag.go

packages/ledgerstate/utxo_dag_test.go

packages/tangle/booker.go

packages/jsonmodels/ledgerstate.go

…' of github.com:iotaledger/goshimmer into feat/remove-aggregated-branches-replace-simple-branches # Conflicts: # packages/tangle/messagefactory_test.go

packages/tangle/testutils.go

…' of github.com:iotaledger/goshimmer into feat/remove-aggregated-branches-replace-simple-branches

packages/ledgerstate/branch.go

packages/ledgerstate/branch_dag.go

packages/tangle/testutils.go

…' of github.com:iotaledger/goshimmer into feat/remove-aggregated-branches-replace-simple-branches

karimodm

Great work man, thanks!

packages/consensus/otv/otv_test.go

packages/consensus/finality/finality_gadget.go

packages/ledgerstate/branch.go

packages/ledgerstate/transaction.go

packages/ledgerstate/output.go

packages/ledgerstate/transaction.go

packages/tangle/approvalweightmanager.go

packages/tangle/ledgerstate.go

…move-aggregated-branches-replace-simple-branches # Conflicts: # pkged.go # plugins/webapi/tools/message/diagnostic_messages.go

plugins/webapi/tools/message/diagnostic_messages.go

hmoog

I have left some comments

packages/ledgerstate/output.go

packages/ledgerstate/transaction.go

packages/ledgerstate/utxo_dag.go

packages/tangle/booker.go

packages/tangle/message.go

packages/txstream/tangleledger/tangleledger.go

This reverts commit ba3c485.

jonastheis added 2 commits February 22, 2022 16:18

Remove aggregated branches and replace with BranchIDs on ledger state…

8e3dc3e

… objects

Fix some tests

cd4b4cc

jonastheis mentioned this pull request Feb 22, 2022

Feat: Remove aggregated branches #2047

Closed

5 tasks

github-actions bot reviewed Feb 22, 2022

View reviewed changes

jonastheis marked this pull request as draft February 22, 2022 20:10

Fix UTXO DAG tests

9305856

karimodm changed the base branch from develop to feat/mtm-aftermath February 23, 2022 09:54

jonastheis added 4 commits February 23, 2022 12:24

Fix Branch DAG tests

162afb2

Fix errors in OTV package

080f6af

Add BranchIDs to messages and fix resulting errors in booker

64d1b07

MarkersManager handles now BranchIDs instead of BranchID

a00a40e

github-actions bot reviewed Feb 24, 2022

View reviewed changes

packages/tangle/booker.go Outdated Show resolved Hide resolved

jonastheis and others added 3 commits February 24, 2022 16:26

Fix booker tests

7c4b9e8

Fix ledger state tests

316733c

Fix: some compile errors

cc32020

karimodm force-pushed the feat/remove-aggregated-branches-replace-simple-branches branch from 7a31b14 to cc32020 Compare February 25, 2022 12:40

github-actions bot reviewed Feb 25, 2022

View reviewed changes

packages/jsonmodels/ledgerstate.go Outdated Show resolved Hide resolved

karimodm and others added 4 commits February 25, 2022 14:16

Fix: no compile errors outside of tests

523a006

Fix more tests

1526eba

Merge branch 'feat/remove-aggregated-branches-replace-simple-branches…

d79c378

…' of github.com:iotaledger/goshimmer into feat/remove-aggregated-branches-replace-simple-branches # Conflicts: # packages/tangle/messagefactory_test.go

Fix: warning fixes & pkged.go

c5f0fb8

github-actions bot reviewed Feb 25, 2022

View reviewed changes

packages/tangle/testutils.go Outdated Show resolved Hide resolved

jonastheis and others added 6 commits February 25, 2022 13:30

Fix AW manager test

a7d1cdd

Merge branch 'feat/remove-aggregated-branches-replace-simple-branches…

5b46fb1

…' of github.com:iotaledger/goshimmer into feat/remove-aggregated-branches-replace-simple-branches

Fix: dashboard Message Explorer

4363b8b

Merge branch 'feat/remove-aggregated-branches-replace-simple-branches…

17d26b5

…' of github.com:iotaledger/goshimmer into feat/remove-aggregated-branches-replace-simple-branches

Fix: integreation tests compile

9213c86

Refactor: please doggo

4912141

github-actions bot reviewed Feb 25, 2022

View reviewed changes

packages/ledgerstate/branch.go Outdated Show resolved Hide resolved

packages/ledgerstate/branch_dag.go Outdated Show resolved Hide resolved

packages/tangle/testutils.go Outdated Show resolved Hide resolved

Fix branch marshalling bug

ac04066

jonastheis added 2 commits February 28, 2022 10:59

Avoid restarting containers in Docker network

58a2194

Hopefully fix integration test on CI

69307bd

jonastheis marked this pull request as ready for review February 28, 2022 11:34

jonastheis requested review from karimodm and hmoog February 28, 2022 11:44

karimodm added 5 commits February 28, 2022 15:14

Refactor: remove references to ConflictBranch

bfbad86

Merge branch 'feat/remove-aggregated-branches-replace-simple-branches…

77bc71e

…' of github.com:iotaledger/goshimmer into feat/remove-aggregated-branches-replace-simple-branches

Refactor: change receiver of Branch to b

99024b4

Fix: remove BranchType from dashboard

c15e480

Refactor: remove unused error

59e32f5

karimodm suggested changes Feb 28, 2022

View reviewed changes

karimodm and others added 3 commits February 28, 2022 16:29

Refactor: tiny fixes + pkged.go

fd62dde

Address review comments

ccf500b

Merge remote-tracking branch 'origin/feat/mtm-aftermath' into feat/re…

f4091d4

…move-aggregated-branches-replace-simple-branches # Conflicts: # pkged.go # plugins/webapi/tools/message/diagnostic_messages.go

github-actions bot reviewed Mar 2, 2022

View reviewed changes

plugins/webapi/tools/message/diagnostic_messages.go Outdated Show resolved Hide resolved

Please doggo

be9a8bc

karimodm approved these changes Mar 2, 2022

View reviewed changes

Refactor: simplified code

8b5bd42

hmoog suggested changes Mar 2, 2022

View reviewed changes

Address review comments

7827635

jonastheis merged commit ba3c485 into feat/mtm-aftermath Mar 4, 2022

jonastheis deleted the feat/remove-aggregated-branches-replace-simple-branches branch March 4, 2022 13:25

jonastheis added a commit that referenced this pull request Mar 4, 2022

Revert "Remove aggregated branches (#2070)"

89d5d94

This reverts commit ba3c485.

jonastheis restored the feat/remove-aggregated-branches-replace-simple-branches branch March 4, 2022 16:29

jonastheis deleted the feat/remove-aggregated-branches-replace-simple-branches branch March 4, 2022 16:32

jonastheis mentioned this pull request Mar 14, 2022

Version bump for v0.8.10 #2118

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove aggregated branches #2070

Remove aggregated branches #2070

jonastheis commented Feb 22, 2022 •

edited

Loading

karimodm left a comment

hmoog left a comment

Remove aggregated branches #2070

Remove aggregated branches #2070

Conversation

jonastheis commented Feb 22, 2022 • edited Loading

Description of change

Type of change

karimodm left a comment

Choose a reason for hiding this comment

hmoog left a comment

Choose a reason for hiding this comment

jonastheis commented Feb 22, 2022 •

edited

Loading