From 1132536be92df9833ccaa72683eaa7e74e10b9e3 Mon Sep 17 00:00:00 2001 From: Rasmus Dahlberg Date: Tue, 3 Nov 2020 10:22:57 +0100 Subject: fixed FindLog such that it uses a list of operators --- server/descriptor/.descriptor.go.swp | Bin 12288 -> 0 bytes server/descriptor/descriptor.go | 10 ++++++---- server/descriptor/descriptor_test.go | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) delete mode 100644 server/descriptor/.descriptor.go.swp (limited to 'server') diff --git a/server/descriptor/.descriptor.go.swp b/server/descriptor/.descriptor.go.swp deleted file mode 100644 index e12d5cd..0000000 Binary files a/server/descriptor/.descriptor.go.swp and /dev/null differ diff --git a/server/descriptor/descriptor.go b/server/descriptor/descriptor.go index ba90289..016d1cc 100644 --- a/server/descriptor/descriptor.go +++ b/server/descriptor/descriptor.go @@ -30,10 +30,12 @@ type Log struct { BaseUrl string `json:"base_url"` // E.g., example.com/st/v1 } -func (op *Operator) FindLog(logId []byte) (*Log, error) { - for _, log := range op.Logs { - if bytes.Equal(logId, log.Id) { - return log, nil +func FindLog(ops []Operator, logId []byte) (*Log, error) { + for _, op := range ops { + for _, log := range op.Logs { + if bytes.Equal(logId, log.Id) { + return log, nil + } } } return nil, fmt.Errorf("no such log: %s", base64.StdEncoding.EncodeToString(logId)) diff --git a/server/descriptor/descriptor_test.go b/server/descriptor/descriptor_test.go index e461f88..d01fc66 100644 --- a/server/descriptor/descriptor_test.go +++ b/server/descriptor/descriptor_test.go @@ -48,14 +48,14 @@ func TestUnmarshal(t *testing.T) { func TestFindLog(t *testing.T) { for _, table := range []struct { - op Operator + ops []Operator logId []byte wantError bool }{ - {makeOperatorList()[0], deb64("B9oCJk4XIOMXba8dBM5yUj+NLtqTE6xHwbvR9dYkHPM="), false}, - {makeOperatorList()[0], []byte{0, 1, 2, 3}, true}, + {makeOperatorList(), deb64("B9oCJk4XIOMXba8dBM5yUj+NLtqTE6xHwbvR9dYkHPM="), false}, + {makeOperatorList(), []byte{0, 1, 2, 3}, true}, } { - _, err := table.op.FindLog(table.logId) + _, err := FindLog(table.ops, table.logId) if (err != nil) != table.wantError { t.Errorf("wanted log not found for id: %v", table.logId) } -- cgit v1.2.3