[tor-commits] [torspec/master] bandwidth-file: Correct KeyValues names

[nickm at torproject.org]

commit 4ec93f2d8b2add1da598d927785ed7d8e60f0ec3
Author: juga0 <juga at riseup.net>
Date:   Tue Mar 3 14:58:04 2020 +0000

    bandwidth-file: Correct KeyValues names
    
    The KeyValues never appeared in a bandwidth file generated by the
    bwauths with those names, it was a mistake when writing this
    specification.
    
    The replacements done are:
    
    - s/desc_bw_average/desc_bw_avg/
    - s/desc_obs_bw_last/desc_bw_obs_last/
    - s/desc_obs_bw_mean/desc_bw_obs_mean/
    
    And in the examples:
    
    - s/desc_avg_bw/desc_bw_avg/
    - s/desc_obs_bw_last/desc_bw_obs_last/
    - s/desc_obs_bw_mean/desc_bw_obs_mean/
    
    Part of #30726.
---
 bandwidth-file-spec.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt
index 5a2954c..0345c96 100644
--- a/bandwidth-file-spec.txt
+++ b/bandwidth-file-spec.txt
@@ -771,7 +771,7 @@
 
       This KeyValue was added in version 1.2.0 of this specification.
 
-    "desc_bw_average=" Int
+    "desc_bw_avg=" Int
 
       [Zero or one time.]
 
@@ -779,7 +779,7 @@
 
       This KeyValue was added in version 1.2.0 of this specification.
 
-    "desc_obs_bw_last=" Int
+    "desc_bw_obs_last=" Int
 
       [Zero or one time.]
 
@@ -788,7 +788,7 @@
 
       This KeyValue was added in version 1.2.0 of this specification.
 
-    "desc_obs_bw_mean=" Int
+    "desc_bw_obs_mean=" Int
 
       [Zero or one time.]
 
@@ -972,8 +972,8 @@ percent_eligible_relays=93
 software=sbws
 software_version=1.0.3
 =====
-bw=38000 bw_mean=1127824 bw_median=1180062 desc_avg_bw=1073741824 desc_obs_bw_last=17230879 desc_obs_bw_mean=14732306 error_circ=0 error_misc=0 error_stream=1 master_key_ed25519=YaqV4vbvPYKucElk297eVdNArDz9HtIwUoIeo0+cVIpQ nick=Test node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 rtt=380 success=1 time=2018-05-08T16:13:26
-bw=1 bw_mean=199162 bw_median=185675 desc_avg_bw=409600 desc_obs_bw_last=836165 desc_obs_bw_mean=858030 error_circ=0 error_misc=0 error_stream=0 master_key_ed25519=a6a+dZadrQBtfSbmQkP7j2ardCmLnm5NJ4ZzkvDxbo0I nick=Test2 node_id=$96C15995F30895689291F455587BD94CA427B6FC rtt=378 success=1 time=2018-05-08T16:13:36
+bw=38000 bw_mean=1127824 bw_median=1180062 desc_bw_avg=1073741824 desc_bw_obs_last=17230879 desc_bw_obs_mean=14732306 error_circ=0 error_misc=0 error_stream=1 master_key_ed25519=YaqV4vbvPYKucElk297eVdNArDz9HtIwUoIeo0+cVIpQ nick=Test node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 rtt=380 success=1 time=2018-05-08T16:13:26
+bw=1 bw_mean=199162 bw_median=185675 desc_bw_avg=409600 desc_bw_obs_last=836165 desc_bw_obs_mean=858030 error_circ=0 error_misc=0 error_stream=0 master_key_ed25519=a6a+dZadrQBtfSbmQkP7j2ardCmLnm5NJ4ZzkvDxbo0I nick=Test2 node_id=$96C15995F30895689291F455587BD94CA427B6FC rtt=378 success=1 time=2018-05-08T16:13:36
 
 A.3.1. When there are not enough eligible measured relays: