simplify block functions

1 files changed, 5 insertions, 9 deletions

diff --git a/draft-schanzen-r5n.xml b/draft-schanzen-r5n.xml
index 6a58c91..412c460 100644
--- a/draft-schanzen-r5n.xml
+++ b/draft-schanzen-r5n.xml
@@ -1346,8 +1346,7 @@ bchar = *(ALPHA / DIGIT)
             <li>
               Next, the <tt>ValidateBlockStoreRequest</tt> procedure for the <tt>BTYPE</tt>
               as described in <xref target="block_functions"/> is used to
-              validate the block payload.  If a key could not be derived in the previous step, the
-              key from the request is used for validation.  If the block payload
+              validate the block payload. If the block payload
               is invalid, the message <bcp14>MUST</bcp14> be discarded.
             </li>
             <li>
@@ -1725,11 +1724,8 @@ bchar = *(ALPHA / DIGIT)
               requested <tt>BTYPE</tt>.  To do this, the peer attempts to compute the
               key using <tt>DeriveBlockKey</tt>.  Note that the computed key
               does not have to match the <tt>QUERY_HASH</tt>.  Next, the peer
-              checks that the block is valid using <tt>ValidateBlockStoreRequest</tt>
-              using the derived key if it is available. If the derived key is
-              <tt>NONE</tt>, the query hash is passed to <tt>ValidateBlockStoreRequest</tt>
-              instead of a key. If the
-              result is <tt>BLOCK_INVALID</tt>, the message <bcp14>MUST</bcp14> be
+              checks that the block is valid using <tt>ValidateBlockStoreRequest</tt>.
+              If the result is <tt>BLOCK_INVALID</tt>, the message <bcp14>MUST</bcp14> be
               discarded.
             </li>
             <li>
@@ -1848,11 +1844,11 @@ bchar = *(ALPHA / DIGIT)
               permit deriving the key from the block.  A Key may be returned
               for a block that is ill-formed.
             </dd>
-            <dt>ValidateBlockStoreRequest(Block, Key)
+            <dt>ValidateBlockStoreRequest(Block)
                 -&gt; BlockEvaluationResult</dt>
             <dd>
               <t>
-              is used to evaluate a block including its key and payload
+              is used to evaluate a block payload
               as part of <tt>PutMessage</tt> and <tt>ResultMessage</tt> processing.
               Possible values for the <tt>BlockEvaluationResult</tt> are:
               </t>