Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions coserv/coserv_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ func TestCoserv_ToCBOR_rv_class_simple(t *testing.T) {
query, err := NewQuery(ArtifactTypeReferenceValues, *envSelector, ResultTypeSourceArtifacts)
require.NoError(t, err)

// overwrite the default query timestamp
query.SetTimestamp(testTimestamp)

tv, err := NewCoserv(
`tag:example.com,2025:cc-platform#1.0.0`,
*query,
Expand All @@ -47,9 +44,6 @@ func TestCoserv_ToCBOR_exampleClassSelector(t *testing.T) {
query, err := NewQuery(ArtifactTypeReferenceValues, *exampleClassSelector(t), ResultTypeCollectedArtifacts)
require.NoError(t, err)

// overwrite the default query timestamp
query.SetTimestamp(testTimestamp)

tv, err := NewCoserv(
`tag:example.com,2025:cc-platform#1.0.0`,
*query,
Expand All @@ -71,9 +65,6 @@ func TestCoserv_ToCBOR_exampleInstanceSelector(t *testing.T) {
query, err := NewQuery(ArtifactTypeReferenceValues, *exampleInstanceSelector(t), ResultTypeBoth)
require.NoError(t, err)

// overwrite the default query timestamp
query.SetTimestamp(testTimestamp)

tv, err := NewCoserv(
`tag:example.com,2025:cc-platform#1.0.0`,
*query,
Expand All @@ -91,9 +82,6 @@ func TestCoserv_ToCBOR_exampleGroupSelector(t *testing.T) {
query, err := NewQuery(ArtifactTypeReferenceValues, *exampleGroupSelector(t), ResultTypeSourceArtifacts)
require.NoError(t, err)

// overwrite the default query timestamp
query.SetTimestamp(testTimestamp)

tv, err := NewCoserv(
`tag:example.com,2025:cc-platform#1.0.0`,
*query,
Expand Down Expand Up @@ -129,7 +117,6 @@ func TestCoserv_FromBase64Url_ok_class(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, `tag:example.com,2025:cc-platform#1.0.0`, actualProfile)
assert.Equal(t, "reference-values", actual.Query.ArtifactType.String())
assert.Equal(t, testTimestamp, actual.Query.Timestamp)
assert.Equal(t, "collected-artifacts", actual.Query.ResultType.String())
assert.Equal(t, *exampleClassSelector(t), actual.Query.EnvironmentSelector)
}
Expand All @@ -146,7 +133,6 @@ func TestCoserv_FromBase64Url_ok_instance(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, `tag:example.com,2025:cc-platform#1.0.0`, actualProfile)
assert.Equal(t, "reference-values", actual.Query.ArtifactType.String())
assert.Equal(t, testTimestamp, actual.Query.Timestamp)
assert.Equal(t, "both", actual.Query.ResultType.String())
assert.Equal(t, *exampleInstanceSelector(t), actual.Query.EnvironmentSelector)
}
Expand All @@ -163,7 +149,6 @@ func TestCoserv_FromBase64Url_ok_group(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, `tag:example.com,2025:cc-platform#1.0.0`, actualProfile)
assert.Equal(t, "reference-values", actual.Query.ArtifactType.String())
assert.Equal(t, testTimestamp, actual.Query.Timestamp)
assert.Equal(t, "source-artifacts", actual.Query.ResultType.String())
assert.Equal(t, *exampleGroupSelector(t), actual.Query.EnvironmentSelector)
}
Expand All @@ -181,9 +166,6 @@ func TestCoserv_ToBase64Url_ok_instance(t *testing.T) {
query, err := NewQuery(ArtifactTypeReferenceValues, *exampleInstanceSelector(t), ResultTypeBoth)
require.NoError(t, err)

// overwrite the default query timestamp
query.SetTimestamp(testTimestamp)

tv, err := NewCoserv(
`tag:example.com,2025:cc-platform#1.0.0`,
*query,
Expand All @@ -204,9 +186,6 @@ func TestCoserv_ToBase64Url_ok_class(t *testing.T) {
query, err := NewQuery(ArtifactTypeReferenceValues, *exampleClassSelector(t), ResultTypeCollectedArtifacts)
require.NoError(t, err)

// overwrite the default query timestamp
query.SetTimestamp(testTimestamp)

tv, err := NewCoserv(
`tag:example.com,2025:cc-platform#1.0.0`,
*query,
Expand All @@ -227,9 +206,6 @@ func TestCoserv_ToBase64Url_ok_group(t *testing.T) {
query, err := NewQuery(ArtifactTypeReferenceValues, *exampleGroupSelector(t), ResultTypeSourceArtifacts)
require.NoError(t, err)

// overwrite the default query timestamp
query.SetTimestamp(testTimestamp)

tv, err := NewCoserv(
`tag:example.com,2025:cc-platform#1.0.0`,
*query,
Expand All @@ -250,9 +226,6 @@ func TestCoserv_ToEDN_ok(t *testing.T) {
query, err := NewQuery(ArtifactTypeReferenceValues, *exampleClassSelector(t), ResultTypeCollectedArtifacts)
require.NoError(t, err)

// overwrite the default query timestamp
query.SetTimestamp(testTimestamp)

tv, err := NewCoserv(
`tag:example.com,2025:cc-platform#1.0.0`,
*query,
Expand Down Expand Up @@ -292,7 +265,6 @@ func TestCoserv_FromCBOR_Results(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, `tag:example.com,2025:cc-platform#1.0.0`, actualProfile)
assert.Equal(t, "reference-values", actual.Query.ArtifactType.String())
assert.Equal(t, testTimestamp, actual.Query.Timestamp)
assert.Equal(t, *exampleClassSelector2(t), actual.Query.EnvironmentSelector)

// results-related assertions
Expand Down Expand Up @@ -376,9 +348,6 @@ func TestCoserv_results_ToCBOR_ok(t *testing.T) {
query, err := NewQuery(ArtifactTypeReferenceValues, *envSelector, ResultTypeCollectedArtifacts)
require.NoError(t, err)

// overwrite the default query timestamp
query.SetTimestamp(testTimestamp)

tv, err := NewCoserv(
`tag:example.com,2025:cc-platform#1.0.0`,
*query,
Expand Down
7 changes: 7 additions & 0 deletions coserv/environmentselector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ func TestEnvironmentSelector_Valid_mixed_fail(t *testing.T) {
assert.EqualError(t, err, "only one selector type is allowed")
}

func TestEnvironmentSelector_Valid_mixed_fail_alt(t *testing.T) {
tv := badExampleMixedSelectorAlt(t)

err := tv.Valid()
assert.EqualError(t, err, "only one selector type is allowed")
}

func TestEnvironmentSelector_Valid_empty_fail(t *testing.T) {
tv := badExampleEmptySelector(t)

Expand Down
19 changes: 2 additions & 17 deletions coserv/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,16 @@ package coserv

import (
"fmt"
"time"
)

// Query is the internal representation of a Query data item
type Query struct {
ArtifactType ArtifactType `cbor:"0,keyasint"`
EnvironmentSelector EnvironmentSelector `cbor:"1,keyasint"`
Timestamp time.Time `cbor:"2,keyasint"`
ResultType ResultType `cbor:"3,keyasint"`
ResultType ResultType `cbor:"2,keyasint"`
}

// NewQuery creates a new Query instance with the timestamp set to instantiation time.
// (If needed, the timestamp can be changed using SetTimestamp.)
// NewQuery creates a new Query instance.
// An error is returned if the supplied environment selector is invalid.
func NewQuery(
artifactType ArtifactType,
Expand All @@ -31,17 +28,10 @@ func NewQuery(
return &Query{
ArtifactType: artifactType,
EnvironmentSelector: envSelector,
Timestamp: time.Now(),
ResultType: resultType,
}, nil
}

// SetTimestamp allows setting an explicit timestamp for the target Query object
func (o *Query) SetTimestamp(ts time.Time) *Query {
o.Timestamp = ts
return o
}

// Valid ensures that the Query target is correctly populated
func (o Query) Valid() error {
// TODO(tho) add tests for these two:
Expand All @@ -52,10 +42,5 @@ func (o Query) Valid() error {
return fmt.Errorf("invalid environment selector: %w", err)
}

zeroTime := time.Time{}
if o.Timestamp.Equal(zeroTime) {
return fmt.Errorf("timestamp not set")
}

return nil
}
16 changes: 4 additions & 12 deletions coserv/query_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ package coserv

import (
"testing"
"time"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestQuery_Valid_empty_query(t *testing.T) {
Expand All @@ -21,14 +19,8 @@ func TestQuery_Valid_empty_query(t *testing.T) {
assert.EqualError(t, actual, expected)
}

func TestQuery_Valid_invalid_timestamp(t *testing.T) {
tv := exampleClassQuery(t)

require.NotNil(t, tv.SetTimestamp(time.Time{}))

actual := tv.Valid()

expected := "timestamp not set"

assert.EqualError(t, actual, expected)
func TestQuery_NewQuery_invalid_selector(t *testing.T) {
actual, err := NewQuery(ArtifactTypeEndorsedValues, *NewEnvironmentSelector(), ResultTypeBoth)
assert.Nil(t, actual)
assert.EqualError(t, err, "invalid environment selector: non-empty<> constraint violation")
}
30 changes: 17 additions & 13 deletions coserv/test_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@ import (
)

var (
testExpiry, _ = time.Parse("2006-01-02T15:04:05Z", "2030-12-13T18:30:02Z")
testTimestamp, _ = time.Parse("2006-01-02T15:04:05Z", "2030-12-01T18:30:01Z")
testAuthority = []byte{0xab, 0xcd, 0xef}
testBytes = []byte{0x00, 0x11, 0x22, 0x33}
testES256Key = []byte(`{
testExpiry, _ = time.Parse("2006-01-02T15:04:05Z", "2030-12-13T18:30:02Z")
testAuthority = []byte{0xab, 0xcd, 0xef}
testBytes = []byte{0x00, 0x11, 0x22, 0x33}
testES256Key = []byte(`{
"kty": "EC",
"crv": "P-256",
"x": "MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4",
Expand Down Expand Up @@ -115,13 +114,24 @@ func badExampleMixedSelector(t *testing.T) *EnvironmentSelector {
instance0, err := comid.NewUEIDInstance(comid.TestUEID)
require.NoError(t, err)

selector := NewEnvironmentSelector().
AddGroup(StatefulGroup{Group: group0}).
AddInstance(StatefulInstance{Instance: instance0})
require.NotNil(t, selector)

return selector
}

func badExampleMixedSelectorAlt(t *testing.T) *EnvironmentSelector {
instance0, err := comid.NewUEIDInstance(comid.TestUEID)
require.NoError(t, err)

class0 := comid.NewClassUUID(comid.TestUUID)
require.NotNil(t, class0)

selector := NewEnvironmentSelector().
AddGroup(StatefulGroup{Group: group0}).
AddInstance(StatefulInstance{Instance: instance0}).
AddGroup(StatefulGroup{Group: group0})
AddClass(StatefulClass{Class: class0})
require.NotNil(t, selector)

return selector
Expand All @@ -133,12 +143,6 @@ func badExampleEmptySelector(t *testing.T) *EnvironmentSelector {
return es
}

func exampleClassQuery(t *testing.T) *Query {
qry, err := NewQuery(ArtifactTypeReferenceValues, *exampleClassSelector(t), ResultTypeCollectedArtifacts)
require.NoError(t, err)
return qry
}

func exampleReferenceValuesResultSet(t *testing.T) *ResultSet {
env := comid.Environment{
Class: comid.NewClassBytes(comid.TestBytes),
Expand Down
2 changes: 1 addition & 1 deletion coserv/testvectors/example-class-selector-noindent.b64u
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaQAAgGhAIKBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWyBoQDYJVAx-1q_Aj5JkqpOlfnBUDv6AsB0MjAzMC0xMi0wMVQxODozMDowMVoDAA
ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaMAAgGhAIKBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWyBoQDYJVAx-1q_Aj5JkqpOlfnBUDv6AgA
Binary file modified coserv/testvectors/example-class-selector-noindent.cbor
Binary file not shown.
2 changes: 1 addition & 1 deletion coserv/testvectors/example-class-selector-noindent.diag
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{0: "tag:example.com,2025:cc-platform#1.0.0", 1: {0: 2, 1: {0: [[{0: 560(h'00112233'), 1: "Example Vendor", 2: "Example Model"}], [{0: 37(h'31fb5abf023e4992aa4e95f9c1503bfa')}]]}, 2: 0("2030-12-01T18:30:01Z"), 3: 0}}
{0: "tag:example.com,2025:cc-platform#1.0.0", 1: {0: 2, 1: {0: [[{0: 560(h'00112233'), 1: "Example Vendor", 2: "Example Model"}], [{0: 37(h'31fb5abf023e4992aa4e95f9c1503bfa')}]]}, 2: 0}}
2 changes: 1 addition & 1 deletion coserv/testvectors/example-class-selector-noindent.hex
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a4000201a1008281a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c81a100d8255031fb5abf023e4992aa4e95f9c1503bfa02c074323033302d31322d30315431383a33303a30315a0300
a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a3000201a1008281a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c81a100d8255031fb5abf023e4992aa4e95f9c1503bfa0200
2 changes: 1 addition & 1 deletion coserv/testvectors/example-class-selector.b64u
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaQAAgGhAIKBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWyBoQDYJVAx-1q_Aj5JkqpOlfnBUDv6AsB0MjAzMC0xMi0wMVQxODozMDowMVoDAA
ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaMAAgGhAIKBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWyBoQDYJVAx-1q_Aj5JkqpOlfnBUDv6AgA
Binary file modified coserv/testvectors/example-class-selector.cbor
Binary file not shown.
3 changes: 1 addition & 2 deletions coserv/testvectors/example-class-selector.diag
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
} ]
]
},
2: 0("2030-12-01T18:30:01Z"),
3: 0
2: 0
}
}
2 changes: 1 addition & 1 deletion coserv/testvectors/example-class-selector.hex
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a4000201a1008281a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c81a100d8255031fb5abf023e4992aa4e95f9c1503bfa02c074323033302d31322d30315431383a33303a30315a0300
a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a3000201a1008281a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c81a100d8255031fb5abf023e4992aa4e95f9c1503bfa0200
2 changes: 1 addition & 1 deletion coserv/testvectors/example-group-selector.b64u
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaQAAgGhAoKB2QIwRYmZeGVWgdglUDH7Wr8CPkmSqk6V-cFQO_oCwHQyMDMwLTEyLTAxVDE4OjMwOjAxWgMB
ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaMAAgGhAoKB2QIwRYmZeGVWgdglUDH7Wr8CPkmSqk6V-cFQO_oCAQ
Binary file modified coserv/testvectors/example-group-selector.cbor
Binary file not shown.
3 changes: 1 addition & 2 deletions coserv/testvectors/example-group-selector.diag
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
[ 37(h'31FB5ABF023E4992AA4E95F9C1503BFA') ]
]
},
2: 0("2030-12-01T18:30:01Z"),
3: 1
2: 1
}
}
2 changes: 1 addition & 1 deletion coserv/testvectors/example-group-selector.hex
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a4000201a1028281d9023045899978655681d8255031fb5abf023e4992aa4e95f9c1503bfa02c074323033302d31322d30315431383a33303a30315a0301
a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a3000201a1028281d9023045899978655681d8255031fb5abf023e4992aa4e95f9c1503bfa0201
2 changes: 1 addition & 1 deletion coserv/testvectors/example-instance-selector.b64u
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaQAAgGhAYKB2QImRwLerb7v3q2B2QIwRYmZeGVWAsB0MjAzMC0xMi0wMVQxODozMDowMVoDAg
ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaMAAgGhAYKB2QImRwLerb7v3q2B2QIwRYmZeGVWAgI
Binary file modified coserv/testvectors/example-instance-selector.cbor
Binary file not shown.
3 changes: 1 addition & 2 deletions coserv/testvectors/example-instance-selector.diag
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
[ 560(h'8999786556') ]
]
},
2: 0("2030-12-01T18:30:01Z"),
3: 2
2: 2
}
}
2 changes: 1 addition & 1 deletion coserv/testvectors/example-instance-selector.hex
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a4000201a1018281d902264702deadbeefdead81d9023045899978655602c074323033302d31322d30315431383a33303a30315a0302
a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a3000201a1018281d902264702deadbeefdead81d902304589997865560202
Original file line number Diff line number Diff line change
@@ -1 +1 @@
owB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaQAAgGhAIGBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWwCwHQyMDMwLTEyLTAxVDE4OjMwOjAxWgMBAqMAgArAdDIwMzAtMTItMTNUMTg6MzA6MDJaC4KCeB9hcHBsaWNhdGlvbi92bmQuZXhhbXBsZS5yZWZ2YWxzRK-urayCeB9hcHBsaWNhdGlvbi92bmQuZXhhbXBsZS5yZWZ2YWxzRK2sq6o
owB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaMAAgGhAIGBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWwCAQKjAIAKwHQyMDMwLTEyLTEzVDE4OjMwOjAyWguCgngfYXBwbGljYXRpb24vdm5kLmV4YW1wbGUucmVmdmFsc0Svrq2sgngfYXBwbGljYXRpb24vdm5kLmV4YW1wbGUucmVmdmFsc0StrKuq
Binary file modified coserv/testvectors/rv-class-simple-results-source-artifacts.cbor
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
}
] ]
},
/ timestamp / 2: 0("2030-12-01T18:30:01Z"),
/ result-type / 3: 1 / source-artifacts /
/ result-type / 2: 1 / source-artifacts /
},
/ results / 2: {
/ rvq / 0: [ ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a30078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a4000201a1008181a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c02c074323033302d31322d30315431383a33303a30315a030102a300800ac074323033302d31322d31335431383a33303a30325a0b8282781f6170706c69636174696f6e2f766e642e6578616d706c652e72656676616c7344afaeadac82781f6170706c69636174696f6e2f766e642e6578616d706c652e72656676616c7344adacabaa
a30078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a3000201a1008181a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c020102a300800ac074323033302d31322d31335431383a33303a30325a0b8282781f6170706c69636174696f6e2f766e642e6578616d706c652e72656676616c7344afaeadac82781f6170706c69636174696f6e2f766e642e6578616d706c652e72656676616c7344adacabaa
2 changes: 1 addition & 1 deletion coserv/testvectors/rv-class-simple-results.b64u
Original file line number Diff line number Diff line change
@@ -1 +1 @@
owB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaQAAgGhAIGBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWwCwHQyMDMwLTEyLTAxVDE4OjMwOjAxWgMAAqIAgaIBgdkCMEOrze8CgqEAowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWyCoQGiC2tDb21wb25lbnQgQQKCggFBqoICQbuhAaILa0NvbXBvbmVudCBCAoKCAUHMggJB3QrAdDIwMzAtMTItMTNUMTg6MzA6MDJa
owB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaMAAgGhAIGBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWwCAAKiAIGiAYHZAjBDq83vAoKhAKMA2QIwRAARIjMBbkV4YW1wbGUgVmVuZG9yAm1FeGFtcGxlIE1vZGVsgqEBogtrQ29tcG9uZW50IEECgoIBQaqCAkG7oQGiC2tDb21wb25lbnQgQgKCggFBzIICQd0KwHQyMDMwLTEyLTEzVDE4OjMwOjAyWg
Binary file modified coserv/testvectors/rv-class-simple-results.cbor
Binary file not shown.
3 changes: 1 addition & 2 deletions coserv/testvectors/rv-class-simple-results.diag
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
}
] ]
},
/ timestamp / 2: 0("2030-12-01T18:30:01Z"),
/ result-type / 3: 0 / collected-material /
/ result-type / 2: 0 / collected-material /
},
/ results / 2: {
/ rvq / 0: [
Expand Down
2 changes: 1 addition & 1 deletion coserv/testvectors/rv-class-simple-results.hex
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a30078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a4000201a1008181a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c02c074323033302d31322d30315431383a33303a30315a030002a20081a20181d9023043abcdef0282a100a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c82a101a20b6b436f6d706f6e656e7420410282820141aa820241bba101a20b6b436f6d706f6e656e7420420282820141cc820241dd0ac074323033302d31322d31335431383a33303a30325a
a30078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a3000201a1008181a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c020002a20081a20181d9023043abcdef0282a100a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c82a101a20b6b436f6d706f6e656e7420410282820141aa820241bba101a20b6b436f6d706f6e656e7420420282820141cc820241dd0ac074323033302d31322d31335431383a33303a30325a
2 changes: 1 addition & 1 deletion coserv/testvectors/rv-class-simple.b64u
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaQAAgGhAIGBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWwCwHQyMDMwLTEyLTAxVDE4OjMwOjAxWgMB
ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaMAAgGhAIGBowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWwCAQ
Binary file modified coserv/testvectors/rv-class-simple.cbor
Binary file not shown.
3 changes: 1 addition & 2 deletions coserv/testvectors/rv-class-simple.diag
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
}
] ]
},
/ timestamp / 2: 0("2030-12-01T18:30:01Z"),
/ result-type / 3: 1 / source-material /
/ result-type / 2: 1 / source-material /
}
}
2 changes: 1 addition & 1 deletion coserv/testvectors/rv-class-simple.hex
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a4000201a1008181a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c02c074323033302d31322d30315431383a33303a30315a0301
a20078267461673a6578616d706c652e636f6d2c323032353a63632d706c6174666f726d23312e302e3001a3000201a1008181a300d902304400112233016e4578616d706c652056656e646f72026d4578616d706c65204d6f64656c0201
2 changes: 1 addition & 1 deletion coserv/testvectors/rv-class-stateful.b64u
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaQAAgGhAIGCowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWyBoQGiC2tDb21wb25lbnQgQQKBggFBqgLAdDIwMzAtMTItMDFUMTg6MzA6MDFaAwE
ogB4JnRhZzpleGFtcGxlLmNvbSwyMDI1OmNjLXBsYXRmb3JtIzEuMC4wAaMAAgGhAIGCowDZAjBEABEiMwFuRXhhbXBsZSBWZW5kb3ICbUV4YW1wbGUgTW9kZWyBoQGiC2tDb21wb25lbnQgQQKBggFBqgIB
Binary file modified coserv/testvectors/rv-class-stateful.cbor
Binary file not shown.
Loading