mirrors/dnscrypt-proxy
1
0
Fork 0
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git synced 2025-04-06 06:37:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Refactor away some unnecessary type shuffling

Browse source 
Signatures in particular were read in from both cache and url as `[]byte`, converted to `string`, then back to `[]byte` to pass through to minisign.
Lists themselves will be converted to `string` by the parsing code anyway.
This commit is contained in:
William Elwood 2019-10-30 05:31:28 +00:00 • committed by Frank Denis
parent ad92be5b9c
commit fe34d07b68
2 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dnscrypt-proxy/sources_test.go
View file

@ -55,7 +55,8 @@ type SourceTestData struct {
type SourceTestExpect struct {
success, download bool
in, cachePath string
in []byte
cachePath string
cache []SourceFixture
refresh time.Time
urls []string
@ -248,9 +249,9 @@ func prepSourceTestCache(t *testing.T, d *SourceTestData, e *SourceTestExpect, s
e.cache = []SourceFixture{d.fixtures[state][source], d.fixtures[state][source+".minisig"]}
switch state {
case TestStateCorrect:
e.in, e.success, e.refresh = string(e.cache[0].content), true, d.timeUpd
e.in, e.success, e.refresh = e.cache[0].content, true, d.timeUpd
case TestStateExpired:
e.in = string(e.cache[0].content)
e.in = e.cache[0].content
case TestStatePartial, TestStatePartialSig:
e.err = "signature"
case TestStateMissing, TestStateMissingSig:
@ -269,7 +270,7 @@ func prepSourceTestDownload(t *testing.T, d *SourceTestData, e *SourceTestExpect
switch state {
case TestStateCorrect:
e.cache = []SourceFixture{d.fixtures[state][source], d.fixtures[state][source+".minisig"]}
e.in, e.success, e.refresh = string(e.cache[0].content), true, d.timeUpd
e.in, e.success, e.refresh = e.cache[0].content, true, d.timeUpd
fallthrough
case TestStateMissingSig, TestStatePartial, TestStatePartialSig, TestStateReadSigErr:
d.reqExpect[path+".minisig"]++