add a helper for roundtripping time.time objects

testgen/main.go

@@ -12,6 +12,7 @@ func main() {
 		types.SimpleTypeTwo{},
 		types.DeferredContainer{},
 		types.FixedArrays{},
+		types.ThingWithSomeTime{},
 	); err != nil {
 		panic(err)
 	}

testing/roundtrip_test.go

@@ -6,6 +6,7 @@ import (
 	"reflect"
 	"testing"
 	"testing/quick"
+	"time"
 
 	"github.com/google/go-cmp/cmp"
 	cbg "github.com/whyrusleeping/cbor-gen"
@@ -115,3 +116,34 @@ func TestFixedArrays(t *testing.T) {
 	recepticle := &FixedArrays{}
 	testValueRoundtrip(t, zero, recepticle)
 }
+
+func TestTimeIsh(t *testing.T) {
+	val := &ThingWithSomeTime{
+		When:    cbg.CborTime(time.Now()),
+		Stuff:   1234,
+		CatName: "hank",
+	}
+
+	buf := new(bytes.Buffer)
+	if err := val.MarshalCBOR(buf); err != nil {
+		t.Fatal(err)
+	}
+
+	out := ThingWithSomeTime{}
+	if err := out.UnmarshalCBOR(buf); err != nil {
+		t.Fatal(err)
+	}
+
+	if out.When.Time().UnixNano() != val.When.Time().UnixNano() {
+		t.Fatal("time didnt round trip properly", out.When.Time(), val.When.Time())
+	}
+
+	if out.Stuff != val.Stuff {
+		t.Fatal("no")
+	}
+
+	if out.CatName != val.CatName {
+		t.Fatal("no")
+	}
+
+}

testing/types.go

@@ -55,6 +55,12 @@ type FixedArrays struct {
 	Uint64 [20]uint64
 }
 
+type ThingWithSomeTime struct {
+	When    cbg.CborTime
+	Stuff   int64
+	CatName string
+}
+
 // Do not add fields to this type.
 type NeedScratchForMap struct {
 	Thing bool

utils.go

@@ -9,6 +9,7 @@ import (
 	"io"
 	"io/ioutil"
 	"math"
+	"time"
 
 	cid "github.com/ipfs/go-cid"
 )
@@ -691,3 +692,50 @@ func (ci *CborInt) UnmarshalCBOR(r io.Reader) error {
 	*ci = CborInt(extraI)
 	return nil
 }
+
+type CborTime time.Time
+
+func (ct *CborTime) MarshalCBOR(w io.Writer) error {
+	b, err := (*time.Time)(ct).MarshalBinary()
+	if err != nil {
+		return err
+	}
+
+	if err := CborWriteHeader(w, MajByteString, uint64(len(b))); err != nil {
+		return err
+	}
+
+	if _, err := w.Write(b); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (ct *CborTime) UnmarshalCBOR(r io.Reader) error {
+	t, l, err := CborReadHeader(r)
+	if err != nil {
+		return err
+	}
+
+	if t != MajByteString {
+		return fmt.Errorf("CborTime expects to find a byte array (got %d)", t)
+	}
+
+	buf := make([]byte, l)
+	if _, err := io.ReadFull(r, buf); err != nil {
+		return err
+	}
+
+	tm := time.Time{}
+	if err := tm.UnmarshalBinary(buf); err != nil {
+		return err
+	}
+
+	*ct = (CborTime)(tm)
+	return nil
+}
+
+func (ct CborTime) Time() time.Time {
+	return (time.Time)(ct)
+}