From 2696b223486be58d71cea239567f926af9558ad0 Mon Sep 17 00:00:00 2001
From: Greg Fitzgerald <greg@solana.com>
Date: Sun, 11 Nov 2018 21:32:58 -0700
Subject: [PATCH] Cleanup TVU diagram

---
 art/tvu.bob     |  41 +++---
 src/img/tvu.svg | 342 ++++++++++++++++++++----------------------------
 2 files changed, 162 insertions(+), 221 deletions(-)

diff --git a/art/tvu.bob b/art/tvu.bob
index 76b82f58d4..55c569b123 100644
--- a/art/tvu.bob
+++ b/art/tvu.bob
@@ -1,23 +1,18 @@
-      .------------------------------------------------.
-      |                                                |
-      |           .------------------------------------+------------.
-      |           |  Tvu                               |            |
-      |           |                                    |            |
-      |           |                                    |            |  .------------.
-      |           |                   .----------------+-------------->| Validators |
-      |           |                   |                |            |  `------------`
-      v           |  .-------.        |                |            `--------------------------.
- .----+---.       |  |       |   .----+-------.   .----+---------.   .--------.   .---------.  |
- | Leader |--------->| Blob  |   | Retransmit |   | Replicate    |   | Ledger |   | Storage |  |
- `--------`       |  | Fetch |-->|   Stage    |-->| Stage /      |-->| Write  |-->|         |  |
- .------------.   |  | Stage |   |            |   | Vote Stage   |   | Stage  |   | Stage   |  |
- | Validators |----->|       |   `------------`   `----+---------`   `--------`   `---------`  |
- `------------`   |  `-------`                         |                                       |
-                  |                                    |                                       |
-                  |                                    |                                       |
-                  `------------------------------------|---------------------------------------`
-                                                       |
-                                                       v
-                                                    .------.
-                                                    | Bank |
-                                                    `------`
+      .--------------------------------------------.
+      |                                            |
+      |       .------------------------------------|---------------------------------------.
+      |       |  Tvu                               |                                       |
+      |       |                                    |                                       |
+      v       |  .-------.   .------------.   .----+---------.   .--------.   .---------.  |
+ .--------.   |  | Blob  |   | Retransmit |   | Replicate    |   | Ledger |   | Storage |  |
+ | Leader |----->| Fetch |-->|   Stage    |-->|   Stage      |-->| Write  |-->|  Stage  |  |
+ `--------`   |  | Stage |   |            |   |              |   | Stage  |   |         |  |
+              |  `-------`   `----+-------`   `----+---------`   `--------`   `---------`  |
+              |        ^          |                |                                       |
+              |        |          |                |                                       |
+              `--------|----------|----------------|---------------------------------------`
+                       |          |                |
+                       |          V                v
+                      .+-----------.            .------.
+                      | Validators |            | Bank |
+                      `------------`            `------`
diff --git a/src/img/tvu.svg b/src/img/tvu.svg
index ce1ab00326..6080e033bc 100644
--- a/src/img/tvu.svg
+++ b/src/img/tvu.svg
@@ -1,4 +1,4 @@
-<svg class="bob" font-family="arial" font-size="14" height="368" width="768" xmlns="http://www.w3.org/2000/svg">
+<svg class="bob" font-family="arial" font-size="14" height="288" width="736" xmlns="http://www.w3.org/2000/svg">
 <defs>
 <marker id="triangle" markerHeight="8" markerWidth="8" orient="auto" refX="4" refY="2" viewBox="0 0 8 4">
 <polygon fill="black" points="0,0 0,4 8,2 0,0"/>
@@ -56,321 +56,267 @@
     }
     
 </style>
-<rect fill="white" height="368" width="768" x="0" y="0"/>
+<rect fill="white" height="288" width="736" x="0" y="0"/>
 <g>
-<line x1="12" x2="12" y1="156" y2="180"/>
-<path d="M 12 180 A 4 4 0 0 0 16 184" fill="none"/>
-<path d="M 16 152 A 4 4 0 0 0 12 156" fill="none"/>
+<line x1="12" x2="12" y1="108" y2="132"/>
+<path d="M 12 132 A 4 4 0 0 0 16 136" fill="none"/>
+<path d="M 16 104 A 4 4 0 0 0 12 108" fill="none"/>
 </g>
 <g>
-<line x1="12" x2="12" y1="204" y2="228"/>
-<path d="M 12 228 A 4 4 0 0 0 16 232" fill="none"/>
-<path d="M 16 200 A 4 4 0 0 0 12 204" fill="none"/>
+<line x1="16" x2="80" y1="104" y2="104"/>
+<path d="M 84 108 A 4 4 0 0 0 80 104" fill="none"/>
 </g>
 <g>
-<line x1="16" x2="52" y1="152" y2="152"/>
-<line x1="52" x2="80" y1="152" y2="152"/>
-<path d="M 84 156 A 4 4 0 0 0 80 152" fill="none"/>
+<line x1="16" x2="80" y1="136" y2="136"/>
+<path d="M 80 136 A 4 4 0 0 0 84 132" fill="none"/>
 </g>
 <g>
-<line x1="16" x2="80" y1="184" y2="184"/>
-<path d="M 80 184 A 4 4 0 0 0 84 180" fill="none"/>
-</g>
-<g>
-<line x1="16" x2="112" y1="200" y2="200"/>
-<path d="M 116 204 A 4 4 0 0 0 112 200" fill="none"/>
-</g>
-<g>
-<line x1="16" x2="112" y1="232" y2="232"/>
-<path d="M 112 232 A 4 4 0 0 0 116 228" fill="none"/>
-</g>
-<g>
-<line marker-end="url(#triangle)" x1="52" x2="52" y1="12" y2="140"/>
+<line marker-end="url(#triangle)" x1="52" x2="52" y1="12" y2="92"/>
 <path d="M 56 8 A 4 4 0 0 0 52 12" fill="none"/>
 </g>
 <g>
-<line x1="56" x2="440" y1="8" y2="8"/>
-<path d="M 444 12 A 4 4 0 0 0 440 8" fill="none"/>
+<line x1="56" x2="408" y1="8" y2="8"/>
+<path d="M 412 12 A 4 4 0 0 0 408 8" fill="none"/>
 </g>
 <g>
-<line x1="84" x2="84" y1="156" y2="180"/>
+<line x1="84" x2="84" y1="108" y2="132"/>
 </g>
 <g>
-<line marker-end="url(#triangle)" x1="84" x2="164" y1="168" y2="168"/>
+<line marker-end="url(#triangle)" x1="84" x2="132" y1="120" y2="120"/>
 </g>
 <g>
-<line x1="116" x2="116" y1="204" y2="228"/>
+<line x1="116" x2="116" y1="44" y2="112"/>
+<path d="M 120 40 A 4 4 0 0 0 116 44" fill="none"/>
 </g>
 <g>
-<line marker-end="url(#triangle)" x1="116" x2="164" y1="216" y2="216"/>
+<line x1="116" x2="116" y1="128" y2="196"/>
+<path d="M 116 196 A 4 4 0 0 0 120 200" fill="none"/>
 </g>
 <g>
-<line x1="148" x2="148" y1="44" y2="160"/>
-<path d="M 152 40 A 4 4 0 0 0 148 44" fill="none"/>
+<line x1="120" x2="412" y1="40" y2="40"/>
+<line x1="412" x2="728" y1="40" y2="40"/>
+<path d="M 732 44 A 4 4 0 0 0 728 40" fill="none"/>
 </g>
 <g>
-<line x1="148" x2="148" y1="176" y2="208"/>
+<line x1="120" x2="188" y1="200" y2="200"/>
+<line x1="188" x2="276" y1="200" y2="200"/>
+<line x1="276" x2="412" y1="200" y2="200"/>
+<line x1="412" x2="728" y1="200" y2="200"/>
+<path d="M 728 200 A 4 4 0 0 0 732 196" fill="none"/>
 </g>
 <g>
-<line x1="148" x2="148" y1="224" y2="276"/>
-<path d="M 148 276 A 4 4 0 0 0 152 280" fill="none"/>
+<line x1="140" x2="140" y1="92" y2="148"/>
+<path d="M 140 148 A 4 4 0 0 0 144 152" fill="none"/>
+<path d="M 144 88 A 4 4 0 0 0 140 92" fill="none"/>
 </g>
 <g>
-<line x1="152" x2="444" y1="40" y2="40"/>
-<line x1="444" x2="444" y1="12" y2="40"/>
-<line x1="444" x2="444" y1="40" y2="104"/>
-<line x1="444" x2="544" y1="40" y2="40"/>
-<line x1="444" x2="444" y1="104" y2="152"/>
-<line marker-end="url(#triangle)" x1="444" x2="564" y1="104" y2="104"/>
-<line x1="444" x2="520" y1="152" y2="152"/>
-<path d="M 524 156 A 4 4 0 0 0 520 152" fill="none"/>
-<path d="M 548 44 A 4 4 0 0 0 544 40" fill="none"/>
+<line x1="144" x2="200" y1="88" y2="88"/>
+<path d="M 204 92 A 4 4 0 0 0 200 88" fill="none"/>
 </g>
 <g>
-<line x1="152" x2="444" y1="280" y2="280"/>
-<line x1="444" x2="760" y1="280" y2="280"/>
-<path d="M 760 280 A 4 4 0 0 0 764 276" fill="none"/>
+<line x1="144" x2="200" y1="152" y2="152"/>
+<path d="M 200 152 A 4 4 0 0 0 204 148" fill="none"/>
 </g>
 <g>
-<line x1="172" x2="172" y1="140" y2="228"/>
-<path d="M 172 228 A 4 4 0 0 0 176 232" fill="none"/>
-<path d="M 176 136 A 4 4 0 0 0 172 140" fill="none"/>
+<line x1="180" x2="180" y1="252" y2="276"/>
+<path d="M 180 276 A 4 4 0 0 0 184 280" fill="none"/>
+<path d="M 184 248 A 4 4 0 0 0 180 252" fill="none"/>
 </g>
 <g>
-<line x1="176" x2="232" y1="136" y2="136"/>
-<path d="M 236 140 A 4 4 0 0 0 232 136" fill="none"/>
+<line x1="184" x2="280" y1="280" y2="280"/>
+<path d="M 280 280 A 4 4 0 0 0 284 276" fill="none"/>
 </g>
 <g>
-<line x1="176" x2="232" y1="232" y2="232"/>
-<path d="M 232 232 A 4 4 0 0 0 236 228" fill="none"/>
+<line marker-end="url(#triangle)" x1="188" x2="188" y1="176" y2="164"/>
+<line x1="188" x2="188" y1="176" y2="248"/>
+<line x1="188" x2="184" y1="248" y2="248"/>
+<line x1="188" x2="280" y1="248" y2="248"/>
+<path d="M 284 252 A 4 4 0 0 0 280 248" fill="none"/>
 </g>
 <g>
-<line x1="236" x2="236" y1="140" y2="228"/>
+<line x1="204" x2="204" y1="92" y2="148"/>
 </g>
 <g>
-<line marker-end="url(#triangle)" x1="236" x2="260" y1="184" y2="184"/>
+<line marker-end="url(#triangle)" x1="204" x2="228" y1="120" y2="120"/>
 </g>
 <g>
-<line x1="268" x2="268" y1="156" y2="212"/>
-<path d="M 268 212 A 4 4 0 0 0 272 216" fill="none"/>
-<path d="M 272 152 A 4 4 0 0 0 268 156" fill="none"/>
+<line x1="236" x2="236" y1="92" y2="148"/>
+<path d="M 236 148 A 4 4 0 0 0 240 152" fill="none"/>
+<path d="M 240 88 A 4 4 0 0 0 236 92" fill="none"/>
 </g>
 <g>
-<line x1="272" x2="308" y1="152" y2="152"/>
-<line x1="308" x2="308" y1="108" y2="152"/>
-<line x1="308" x2="368" y1="152" y2="152"/>
-<path d="M 312 104 A 4 4 0 0 0 308 108" fill="none"/>
-<path d="M 372 156 A 4 4 0 0 0 368 152" fill="none"/>
+<line x1="240" x2="336" y1="88" y2="88"/>
+<path d="M 340 92 A 4 4 0 0 0 336 88" fill="none"/>
 </g>
 <g>
-<line x1="272" x2="368" y1="216" y2="216"/>
-<path d="M 368 216 A 4 4 0 0 0 372 212" fill="none"/>
+<line x1="240" x2="276" y1="152" y2="152"/>
+<line marker-end="url(#triangle)" x1="276" x2="276" y1="152" y2="236"/>
+<line x1="276" x2="336" y1="152" y2="152"/>
+<path d="M 336 152 A 4 4 0 0 0 340 148" fill="none"/>
 </g>
 <g>
-<line x1="312" x2="444" y1="104" y2="104"/>
+<line x1="284" x2="284" y1="252" y2="276"/>
 </g>
 <g>
-<line x1="372" x2="372" y1="156" y2="212"/>
+<line x1="340" x2="340" y1="92" y2="148"/>
 </g>
 <g>
-<line marker-end="url(#triangle)" x1="372" x2="396" y1="184" y2="184"/>
+<line marker-end="url(#triangle)" x1="340" x2="364" y1="120" y2="120"/>
 </g>
 <g>
-<line x1="404" x2="404" y1="156" y2="212"/>
-<path d="M 404 212 A 4 4 0 0 0 408 216" fill="none"/>
-<path d="M 408 152 A 4 4 0 0 0 404 156" fill="none"/>
+<line x1="372" x2="372" y1="92" y2="148"/>
+<path d="M 372 148 A 4 4 0 0 0 376 152" fill="none"/>
+<path d="M 376 88 A 4 4 0 0 0 372 92" fill="none"/>
 </g>
 <g>
-<line x1="408" x2="444" y1="152" y2="152"/>
+<line x1="376" x2="412" y1="88" y2="88"/>
+<line x1="412" x2="412" y1="12" y2="88"/>
+<line x1="412" x2="488" y1="88" y2="88"/>
+<path d="M 492 92 A 4 4 0 0 0 488 88" fill="none"/>
 </g>
 <g>
-<line x1="408" x2="444" y1="216" y2="216"/>
-<line marker-end="url(#triangle)" x1="444" x2="444" y1="216" y2="316"/>
-<line x1="444" x2="520" y1="216" y2="216"/>
-<path d="M 520 216 A 4 4 0 0 0 524 212" fill="none"/>
+<line x1="376" x2="412" y1="152" y2="152"/>
+<line marker-end="url(#triangle)" x1="412" x2="412" y1="152" y2="236"/>
+<line x1="412" x2="488" y1="152" y2="152"/>
+<path d="M 488 152 A 4 4 0 0 0 492 148" fill="none"/>
 </g>
 <g>
-<line x1="420" x2="420" y1="332" y2="356"/>
-<path d="M 420 356 A 4 4 0 0 0 424 360" fill="none"/>
-<path d="M 424 328 A 4 4 0 0 0 420 332" fill="none"/>
+<line x1="388" x2="388" y1="252" y2="276"/>
+<path d="M 388 276 A 4 4 0 0 0 392 280" fill="none"/>
+<path d="M 392 248 A 4 4 0 0 0 388 252" fill="none"/>
 </g>
 <g>
-<line x1="424" x2="472" y1="328" y2="328"/>
-<path d="M 476 332 A 4 4 0 0 0 472 328" fill="none"/>
+<line x1="392" x2="440" y1="248" y2="248"/>
+<path d="M 444 252 A 4 4 0 0 0 440 248" fill="none"/>
 </g>
 <g>
-<line x1="424" x2="472" y1="360" y2="360"/>
-<path d="M 472 360 A 4 4 0 0 0 476 356" fill="none"/>
+<line x1="392" x2="440" y1="280" y2="280"/>
+<path d="M 440 280 A 4 4 0 0 0 444 276" fill="none"/>
 </g>
 <g>
-<line x1="464" x2="472" y1="192" y2="176"/>
+<line x1="444" x2="444" y1="252" y2="276"/>
 </g>
 <g>
-<line x1="476" x2="476" y1="332" y2="356"/>
+<line x1="492" x2="492" y1="92" y2="148"/>
 </g>
 <g>
-<line x1="524" x2="524" y1="156" y2="212"/>
+<line marker-end="url(#triangle)" x1="492" x2="516" y1="120" y2="120"/>
 </g>
 <g>
-<line marker-end="url(#triangle)" x1="524" x2="548" y1="184" y2="184"/>
+<line x1="524" x2="524" y1="92" y2="148"/>
+<path d="M 524 148 A 4 4 0 0 0 528 152" fill="none"/>
+<path d="M 528 88 A 4 4 0 0 0 524 92" fill="none"/>
 </g>
 <g>
-<line x1="548" x2="548" y1="44" y2="96"/>
+<line x1="528" x2="592" y1="88" y2="88"/>
+<path d="M 596 92 A 4 4 0 0 0 592 88" fill="none"/>
 </g>
 <g>
-<line x1="548" x2="548" y1="112" y2="132"/>
-<path d="M 548 132 A 4 4 0 0 0 552 136" fill="none"/>
+<line x1="528" x2="592" y1="152" y2="152"/>
+<path d="M 592 152 A 4 4 0 0 0 596 148" fill="none"/>
 </g>
 <g>
-<line x1="552" x2="760" y1="136" y2="136"/>
-<path d="M 764 140 A 4 4 0 0 0 760 136" fill="none"/>
+<line x1="596" x2="596" y1="92" y2="148"/>
 </g>
 <g>
-<line x1="556" x2="556" y1="156" y2="212"/>
-<path d="M 556 212 A 4 4 0 0 0 560 216" fill="none"/>
-<path d="M 560 152 A 4 4 0 0 0 556 156" fill="none"/>
+<line marker-end="url(#triangle)" x1="596" x2="620" y1="120" y2="120"/>
 </g>
 <g>
-<line x1="560" x2="624" y1="152" y2="152"/>
-<path d="M 628 156 A 4 4 0 0 0 624 152" fill="none"/>
+<line x1="628" x2="628" y1="92" y2="148"/>
+<path d="M 628 148 A 4 4 0 0 0 632 152" fill="none"/>
+<path d="M 632 88 A 4 4 0 0 0 628 92" fill="none"/>
 </g>
 <g>
-<line x1="560" x2="624" y1="216" y2="216"/>
-<path d="M 624 216 A 4 4 0 0 0 628 212" fill="none"/>
+<line x1="632" x2="704" y1="88" y2="88"/>
+<path d="M 708 92 A 4 4 0 0 0 704 88" fill="none"/>
 </g>
 <g>
-<line x1="572" x2="572" y1="92" y2="116"/>
-<path d="M 572 116 A 4 4 0 0 0 576 120" fill="none"/>
-<path d="M 576 88 A 4 4 0 0 0 572 92" fill="none"/>
+<line x1="632" x2="704" y1="152" y2="152"/>
+<path d="M 704 152 A 4 4 0 0 0 708 148" fill="none"/>
 </g>
 <g>
-<line x1="576" x2="672" y1="88" y2="88"/>
-<path d="M 676 92 A 4 4 0 0 0 672 88" fill="none"/>
+<line x1="708" x2="708" y1="92" y2="148"/>
 </g>
 <g>
-<line x1="576" x2="672" y1="120" y2="120"/>
-<path d="M 672 120 A 4 4 0 0 0 676 116" fill="none"/>
+<line x1="732" x2="732" y1="44" y2="196"/>
 </g>
 <g>
-<line x1="628" x2="628" y1="156" y2="212"/>
-</g>
-<g>
-<line marker-end="url(#triangle)" x1="628" x2="652" y1="184" y2="184"/>
-</g>
-<g>
-<line x1="660" x2="660" y1="156" y2="212"/>
-<path d="M 660 212 A 4 4 0 0 0 664 216" fill="none"/>
-<path d="M 664 152 A 4 4 0 0 0 660 156" fill="none"/>
-</g>
-<g>
-<line x1="664" x2="736" y1="152" y2="152"/>
-<path d="M 740 156 A 4 4 0 0 0 736 152" fill="none"/>
-</g>
-<g>
-<line x1="664" x2="736" y1="216" y2="216"/>
-<path d="M 736 216 A 4 4 0 0 0 740 212" fill="none"/>
-</g>
-<g>
-<line x1="676" x2="676" y1="92" y2="116"/>
-</g>
-<g>
-<line x1="740" x2="740" y1="156" y2="212"/>
-</g>
-<g>
-<line x1="764" x2="764" y1="140" y2="276"/>
-</g>
-<g>
-<text x="25" y="172">
+<text x="25" y="124">
 Leader
 </text>
 </g>
 <g>
-<text x="25" y="220">
-Validators
-</text>
-</g>
-<g>
-<text x="169" y="60">
+<text x="137" y="60">
 Tvu
 </text>
 </g>
 <g>
-<text x="185" y="172">
+<text x="153" y="108">
 Blob
 </text>
 </g>
 <g>
-<text x="185" y="188">
+<text x="153" y="124">
 Fetch
 </text>
 </g>
 <g>
-<text x="185" y="204">
+<text x="153" y="140">
 Stage
 </text>
 </g>
 <g>
-<text x="281" y="172">
-Retransmit
-</text>
-</g>
-<g>
-<text x="297" y="188">
-Stage
-</text>
-</g>
-<g>
-<text x="417" y="172">
-Replicate
-</text>
-</g>
-<g>
-<text x="417" y="188">
-Stage
-</text>
-</g>
-<g>
-<text x="417" y="204">
-Vote
-</text>
-</g>
-<g>
-<text x="433" y="348">
-Bank
-</text>
-</g>
-<g>
-<text x="457" y="204">
-Stage
-</text>
-</g>
-<g>
-<text x="569" y="172">
-Ledger
-</text>
-</g>
-<g>
-<text x="569" y="188">
-Write
-</text>
-</g>
-<g>
-<text x="569" y="204">
-Stage
-</text>
-</g>
-<g>
-<text x="585" y="108">
+<text x="193" y="268">
 Validators
 </text>
 </g>
 <g>
-<text x="673" y="172">
+<text x="249" y="108">
+Retransmit
+</text>
+</g>
+<g>
+<text x="265" y="124">
+Stage
+</text>
+</g>
+<g>
+<text x="385" y="108">
+Replicate
+</text>
+</g>
+<g>
+<text x="401" y="124">
+Stage
+</text>
+</g>
+<g>
+<text x="401" y="268">
+Bank
+</text>
+</g>
+<g>
+<text x="537" y="108">
+Ledger
+</text>
+</g>
+<g>
+<text x="537" y="124">
+Write
+</text>
+</g>
+<g>
+<text x="537" y="140">
+Stage
+</text>
+</g>
+<g>
+<text x="641" y="108">
 Storage
 </text>
 </g>
 <g>
-<text x="673" y="204">
+<text x="649" y="124">
 Stage
 </text>
 </g>