Merge pull request #2339 from input-output-hk/jc/shelley-spec-var-nam…

…es-alignment few adjustments to shelley spec to align with code
IntersectMBO · Jun 21, 2021 · d3be695 · d3be695
2 parents 91a97d0 + 94d0068
commit d3be695
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/shelley/chain-and-ledger/formal-spec/epoch.tex b/shelley/chain-and-ledger/formal-spec/epoch.tex
@@ -1200,10 +1200,10 @@ \subsection{Rewards Distribution Calculation}
   \emph{Calculation to reward a single stake pool}
   %
   \begin{align*}
-    & \fun{rewardOnePool} \in \PParams \to \Coin \to \N \to \N \to \KeyHash \to \PoolParam\\
+    & \fun{rewardOnePool} \in \PParams \to \Coin \to \N \to \N \to \PoolParam\\
       & ~~~\to \Stake \to \Q \to \Q \to \Coin \to \powerset{\AddrRWD}
            \to (\AddrRWD \mapsto \Coin) \\
-      & \fun{rewardOnePool}~\var{pp}~\var{R}~\var{n}~\var{\overline{N}}~\var{poolHK}~\var{pool}~\var{stake}~{\sigma}~{\sigma_a}~\var{tot}~\var{addrs_{rew}} =
+      & \fun{rewardOnePool}~\var{pp}~\var{R}~\var{n}~\var{\overline{N}}~\var{pool}~\var{stake}~{\sigma}~{\sigma_a}~\var{tot}~\var{addrs_{rew}} =
           \var{rewards}\\
       & ~~~\where \\
       & ~~~~~~~\var{ostake} = \sum_{\substack{
@@ -1218,7 +1218,7 @@ \subsection{Rewards Distribution Calculation}
         \var{pledge} \leq \var{ostake}\\
         0 & \text{otherwise.}
       \end{cases} \\
-      & ~~~~~~~\var{appPerf} = \mkApparentPerformance{(\fun{d}~pp)}{\sigma}{n}{\overline{N}} \\
+      & ~~~~~~~\var{appPerf} = \mkApparentPerformance{(\fun{d}~pp)}{\sigma_a}{n}{\overline{N}} \\
       & ~~~~~~~\var{poolR} = \floor{\var{appPerf}\cdot\var{maxP}} \\
       & ~~~~~~~\var{mRewards} = \\
       & ~~~~~~~~~~\left\{
@@ -1260,12 +1260,11 @@ \subsection{Rewards Distribution Calculation}
                      \var{R}~
                      \var{n}~
                      \var{\overline{N}}~
-                     \var{hk}~
                      \var{p}~
                      \var{s}~
                      \frac{\sum s}{total}~
                      \frac{\sum s}{\var{total}_a}~
-                     \var{tot}~
+                     \var{total}~
                      \var{addrs_{rew}}
                  \mid
         hk\mapsto(p, n, s)\in\var{pdata} \right\} \\