From e2eb7c1ba762872d0b43840d68225fe9dec3dcc0 Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Thu, 7 Feb 2019 08:41:12 -0700 Subject: [PATCH] Render ASCII art --- book/art/forks-pruned.bob | 5 +++++ book/art/forks.bob | 9 ++++++++ book/src/fork-deltas.md | 44 ++++----------------------------------- 3 files changed, 18 insertions(+), 40 deletions(-) create mode 100644 book/art/forks-pruned.bob create mode 100644 book/art/forks.bob diff --git a/book/art/forks-pruned.bob b/book/art/forks-pruned.bob new file mode 100644 index 0000000000..103f075fd3 --- /dev/null +++ b/book/art/forks-pruned.bob @@ -0,0 +1,5 @@ + 2 + /| + / | + 4 | + 5 diff --git a/book/art/forks.bob b/book/art/forks.bob new file mode 100644 index 0000000000..2ebb960054 --- /dev/null +++ b/book/art/forks.bob @@ -0,0 +1,9 @@ + 1 + / \ + 2 \ + /| | + / | | + 4 | | + 5 /\ + 6 \ + 7 diff --git a/book/src/fork-deltas.md b/book/src/fork-deltas.md index efa9a12464..ac97e6b128 100644 --- a/book/src/fork-deltas.md +++ b/book/src/fork-deltas.md @@ -17,17 +17,7 @@ An *active fork* is a direct list of connected forks that descend from the curre For example: -```art - 1 - / \ - 2 \ - /| | - / | | - 4 | | - 5 /\ - 6 \ - 7 -``` +Forks The following *active forks* are in the deltas DAG @@ -42,42 +32,16 @@ A validator votes for a finalized fork. The *active fork* connecting the fork t For example: -```art - 1 - / \ - 2 \ - /| | - / | | - 4 | | - 5 /\ - 6 \ - 7 -``` +Forks * ROLLBACK\_DEPTH=2, vote=5, *active fork*={5,2,1} -```art - 2 - /| - / | - 4 | - 5 -``` +Forks after pruning The new root is 2, and any active forks that are not descendants from 2 are pruned. * ROLLBACK\_DEPTH=2, vote=6, *active fork*={6,1} -```art - 1 - / \ - 2 \ - /| | - / | | - 4 | | - 5 /\ - 6 \ - 7 -``` +Forks The tree remains with `root=1`, since the *active fork* starting at 6 is only 2 forks long.