Skip to content

Commit 891a8d7

Browse files
whyrusleepingwhyrusleeping
committedNov 30, 2015
no newlines in json objects
License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>
·
v0.34.0-rc1floodsub-0
1 parent 792da9d commit 891a8d7

File tree

4 files changed

+10
-61
lines changed

4 files changed

+10
-61
lines changed
 

‎commands/response.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const (
4343
)
4444

4545
func marshalJson(value interface{}) (io.Reader, error) {
46-
b, err := json.MarshalIndent(value, "", " ")
46+
b, err := json.Marshal(value)
4747
if err != nil {
4848
return nil, err
4949
}

‎test/sharness/t0051-object-data/expected_getOut

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
{
2-
"Links": [],
3-
"Data": "\u0008\u0002\u0012\nHello Mars\u0018\n"
4-
}
1+
{"Links":[],"Data":"\u0008\u0002\u0012\nHello Mars\u0018\n"}

‎test/sharness/t0200-unixfs-ls.sh

+7-52
Original file line numberDiff line numberDiff line change
@@ -108,19 +108,7 @@ test_ls_cmd() {
108108

109109
test_expect_success "'ipfs --encoding=json file ls <file hashes>' output looks good" '
110110
cat <<-\EOF >expected_json_ls_file_trailing_newline &&
111-
{
112-
"Arguments": {
113-
"/ipfs/QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy/1024": "QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd"
114-
},
115-
"Objects": {
116-
"QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd": {
117-
"Hash": "QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd",
118-
"Size": 1024,
119-
"Type": "File",
120-
"Links": null
121-
}
122-
}
123-
}
111+
{"Arguments":{"/ipfs/QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy/1024":"QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd"},"Objects":{"QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd":{"Hash":"QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd","Size":1024,"Type":"File","Links":null}}}
124112
EOF
125113
printf "%s\n" "$(cat expected_json_ls_file_trailing_newline)" >expected_json_ls_file &&
126114
test_cmp expected_json_ls_file actual_json_ls_file
@@ -131,46 +119,13 @@ test_ls_cmd() {
131119
'
132120

133121
test_expect_success "'ipfs --encoding=json file ls <duplicates>' output looks good" '
134-
cat <<-\EOF >expected_json_ls_duplicates_file_trailing_newline &&
135-
{
136-
"Arguments": {
137-
"/ipfs/QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy/1024": "QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd",
138-
"/ipfs/QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss": "QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss",
139-
"/ipfs/QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd": "QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd",
140-
"/ipfs/QmfNy183bXiRVyrhyWtq3TwHn79yHEkiAGFr18P7YNzESj/d1": "QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss"
141-
},
142-
"Objects": {
143-
"QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss": {
144-
"Hash": "QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss",
145-
"Size": 0,
146-
"Type": "Directory",
147-
"Links": [
148-
{
149-
"Name": "128",
150-
"Hash": "QmQNd6ubRXaNG6Prov8o6vk3bn6eWsj9FxLGrAVDUAGkGe",
151-
"Size": 128,
152-
"Type": "File"
153-
},
154-
{
155-
"Name": "a",
156-
"Hash": "QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN",
157-
"Size": 6,
158-
"Type": "File"
159-
}
160-
]
161-
},
162-
"QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd": {
163-
"Hash": "QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd",
164-
"Size": 1024,
165-
"Type": "File",
166-
"Links": null
167-
}
168-
}
169-
}
170-
EOF
171-
printf "%s\n" "$(cat expected_json_ls_duplicates_file_trailing_newline)" >expected_json_ls_duplicates_file &&
172-
test_cmp expected_json_ls_duplicates_file actual_json_ls_duplicates_file
122+
cat <<-\EOF >expected_json_ls_duplicates_file_trailing_newline &&
123+
{"Arguments":{"/ipfs/QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy/1024":"QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd","/ipfs/QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss":"QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss","/ipfs/QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd":"QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd","/ipfs/QmfNy183bXiRVyrhyWtq3TwHn79yHEkiAGFr18P7YNzESj/d1":"QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss"},"Objects":{"QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss":{"Hash":"QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss","Size":0,"Type":"Directory","Links":[{"Name":"128","Hash":"QmQNd6ubRXaNG6Prov8o6vk3bn6eWsj9FxLGrAVDUAGkGe","Size":128,"Type":"File"},{"Name":"a","Hash":"QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN","Size":6,"Type":"File"}]},"QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd":{"Hash":"QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd","Size":1024,"Type":"File","Links":null}}}
124+
EOF
125+
printf "%s\n" "$(cat expected_json_ls_duplicates_file_trailing_newline)" >expected_json_ls_duplicates_file &&
126+
test_cmp expected_json_ls_duplicates_file actual_json_ls_duplicates_file
173127
'
128+
174129
}
175130

176131

‎test/sharness/t0230-channel-streaming-http-content-type.sh

+1-4
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@ test_ls_cmd() {
4848
printf "Transfer-Encoding: chunked\r\n" >>expected_output &&
4949
printf "\r\n" >>expected_output &&
5050
cat <<-\EOF >>expected_output &&
51-
{
52-
"Ref": "QmRmPLc1FsPAn8F8F9DQDEYADNX5ER2sgqiokEvqnYknVW",
53-
"Err": ""
54-
}
51+
{"Ref":"QmRmPLc1FsPAn8F8F9DQDEYADNX5ER2sgqiokEvqnYknVW","Err":""}
5552
EOF
5653
printf "\n" >> expected_output &&
5754
perl -pi -e '"'"'chomp if eof'"'"' expected_output &&

1 commit comments

Comments
 (1)

dignifiedquire commented on Dec 1, 2015

@dignifiedquire
dignifiedquire
on Dec 1, 2015
Member

giphy

Please sign in to comment.