Skip to content

Make Regenerated JSON Output Deterministic #1734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jschaul merged 5 commits into from
Sep 6, 2021
Merged

Make Regenerated JSON Output Deterministic #1734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f68e75
Append a newline to JSON golden tests
Sep 3, 2021
175edbc
Pretty print golden JSON files
Sep 3, 2021
b8bd3c8
Make ordering of keys in JSON golden files deterministic
Sep 3, 2021
83aa3f5
Update the changelog
Sep 3, 2021
2683830
Merge branch 'develop' into mdimjasevic/golden-diffs
jschaul Sep 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions CHANGELOG-draft.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ THIS FILE ACCUMULATES THE RELEASE NOTES FOR THE UPCOMING RELEASE.
* The `DELETE /conversations/:cnv/members/:usr` endpoint rewritten to Servant (#1697)
* Remove leftover auto-connect internal endpoint and code (#1716)
* Clean up JSON golden tests (#1729)
* Make regenerated JSON output deterministic (#1734)
* Import fix for snappy linker issue (#1736)

## Federation changes
Expand Down
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"private"
"private"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_10.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"private"
"private"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_11.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"non_activated"
"non_activated"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_12.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"activated"
"activated"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_13.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"private"
"private"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_14.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"private"
"private"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_15.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"team"
"team"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_16.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"activated"
"activated"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_17.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"team"
"team"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_18.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"private"
"private"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_19.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"non_activated"
"non_activated"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"non_activated"
"non_activated"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_20.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"team"
"team"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"activated"
"activated"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"team"
"team"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"private"
"private"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"non_activated"
"non_activated"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"non_activated"
"non_activated"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_8.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"private"
"private"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_AccessRole_user_9.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"non_activated"
"non_activated"
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": 1,
"access_token": "{\u0018󼝍\u000eq𫧸w",
"user": "00002525-0000-2bc3-0000-3a8200006f94",
"token_type": "Bearer"
}
"expires_in": 1,
"token_type": "Bearer",
"user": "00002525-0000-2bc3-0000-3a8200006f94"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_10.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": -20,
"access_token": " 󴛩+􏀾G_𡀎Xj\u0000ef蟺.&U]J𦶻=<hrt3",
"user": "0000376e-0000-4673-0000-1e1800004b06",
"token_type": "Bearer"
}
"expires_in": -20,
"token_type": "Bearer",
"user": "0000376e-0000-4673-0000-1e1800004b06"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_11.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": -19,
"access_token": "pT𤆒\u0011@􌩤\u00143",
"user": "000018c7-0000-4f75-0000-29b0000065fc",
"token_type": "Bearer"
}
"expires_in": -19,
"token_type": "Bearer",
"user": "000018c7-0000-4f75-0000-29b0000065fc"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_12.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": 25,
"access_token": "\u0006\n􈷦FY\u0003uu\u0001",
"user": "00000f4f-0000-0499-0000-78b4000029de",
"token_type": "Bearer"
}
"expires_in": 25,
"token_type": "Bearer",
"user": "00000f4f-0000-0499-0000-78b4000029de"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_13.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": 27,
"access_token": "􀓪Qక󺆢oV|#Hp-󸽆js􋫽󰦶.E􋑔󸰽",
"user": "00001225-0000-145a-0000-277600007725",
"token_type": "Bearer"
}
"expires_in": 27,
"token_type": "Bearer",
"user": "00001225-0000-145a-0000-277600007725"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_14.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": -12,
"access_token": "󱠓",
"user": "00007469-0000-0eae-0000-1a8400004582",
"token_type": "Bearer"
}
"expires_in": -12,
"token_type": "Bearer",
"user": "00007469-0000-0eae-0000-1a8400004582"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_15.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": 26,
"access_token": "󱟾r",
"user": "000011e5-0000-29e4-0000-550400003888",
"token_type": "Bearer"
}
"expires_in": 26,
"token_type": "Bearer",
"user": "000011e5-0000-29e4-0000-550400003888"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_16.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": 18,
"access_token": "p\"􂣑\u000b-\u0003\u0008<𓍀+\u000e􃬐",
"user": "0000633c-0000-6653-0000-772e00005669",
"token_type": "Bearer"
}
"expires_in": 18,
"token_type": "Bearer",
"user": "0000633c-0000-6653-0000-772e00005669"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_17.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": -13,
"access_token": "𧕲z}\u0008RH\u0005@o\u0019m,💜䛩􌵝]\u0004\u001c\rZm,Z",
"user": "00006032-0000-470b-0000-544b00001c88",
"token_type": "Bearer"
}
"expires_in": -13,
"token_type": "Bearer",
"user": "00006032-0000-470b-0000-544b00001c88"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_18.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": -8,
"access_token": "􁸘\\􈝊\u000b2!󼬷𮩖ZE|3(\u0018=Q\u0005b\u0013[󰐕󼶅MW",
"user": "00006b0d-0000-792a-0000-3fb800003867",
"token_type": "Bearer"
}
"expires_in": -8,
"token_type": "Bearer",
"user": "00006b0d-0000-792a-0000-3fb800003867"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_19.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": -16,
"access_token": "h\u0007",
"user": "00004fc5-0000-08b5-0000-0ad800002c12",
"token_type": "Bearer"
}
"expires_in": -16,
"token_type": "Bearer",
"user": "00004fc5-0000-08b5-0000-0ad800002c12"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": -24,
"access_token": "o6Q󸻤\u0017󵜝",
"user": "00007ace-0000-630b-0000-718c00000945",
"token_type": "Bearer"
}
"expires_in": -24,
"token_type": "Bearer",
"user": "00007ace-0000-630b-0000-718c00000945"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_20.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": 17,
"access_token": "󾏂~𤍏#\t\u001c􅍊 ~_W􋹟z_󳩧A",
"user": "00005c43-0000-6c4c-0000-461200000976",
"token_type": "Bearer"
}
"expires_in": 17,
"token_type": "Bearer",
"user": "00005c43-0000-6c4c-0000-461200000976"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": 6,
"access_token": "\u0013u𫨷N<E#􊜰>dWTm\u000fi􋦩",
"user": "00004286-0000-22c5-0000-5dba00001818",
"token_type": "Bearer"
}
"expires_in": 6,
"token_type": "Bearer",
"user": "00004286-0000-22c5-0000-5dba00001818"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": -9,
"access_token": "阹0)&9\\\u000f\u0000O",
"user": "00005c1d-0000-2e06-0000-278a00002d91",
"token_type": "Bearer"
}
"expires_in": -9,
"token_type": "Bearer",
"user": "00005c1d-0000-2e06-0000-278a00002d91"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": 27,
"access_token": "n㚹 {'\u001c📖\u0011C*꺎\u001b",
"user": "00002891-0000-27e1-0000-686000002ba0",
"token_type": "Bearer"
}
"expires_in": 27,
"token_type": "Bearer",
"user": "00002891-0000-27e1-0000-686000002ba0"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": 2,
"access_token": "+瑧8J󰷉\u0001w",
"user": "0000195e-0000-7174-0000-1a5c000030dc",
"token_type": "Bearer"
}
"expires_in": 2,
"token_type": "Bearer",
"user": "0000195e-0000-7174-0000-1a5c000030dc"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": -12,
"access_token": "`gS\u0010\u0003e󻩆o󿂃􁘉󲠖+Htv􂬾\u0019dh\u0002𩩹",
"user": "000038d1-0000-3dd4-0000-499a000014ca",
"token_type": "Bearer"
}
"expires_in": -12,
"token_type": "Bearer",
"user": "000038d1-0000-3dd4-0000-499a000014ca"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_8.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": 27,
"access_token": "\u0000YnC&X9󽿩_",
"user": "000065e0-0000-3b8c-0000-492700007916",
"token_type": "Bearer"
}
"expires_in": 27,
"token_type": "Bearer",
"user": "000065e0-0000-3b8c-0000-492700007916"
}
8 changes: 4 additions & 4 deletions libs/wire-api/test/golden/testObject_AccessToken_user_9.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"expires_in": 23,
"access_token": "􄓳\u0018\u0008󻈱􍠁\u0018f󳬀DDNNR𠷚`H",
"user": "000023d8-0000-406e-0000-3277000079f9",
"token_type": "Bearer"
}
"expires_in": 23,
"token_type": "Bearer",
"user": "000023d8-0000-406e-0000-3277000079f9"
}
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"code"
"code"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_10.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"link"
"link"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_11.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"code"
"code"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_12.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"link"
"link"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_13.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"link"
"link"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_14.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"code"
"code"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_15.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"code"
"code"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_16.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"private"
"private"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_17.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"invite"
"invite"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_18.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"private"
"private"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_19.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"private"
"private"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"link"
"link"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_20.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"link"
"link"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"private"
"private"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"code"
"code"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"invite"
"invite"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"private"
"private"
2 changes: 1 addition & 1 deletion libs/wire-api/test/golden/testObject_Access_user_7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"invite"
"invite"
Loading