ptypes: Avoid assuming time.Duration is nanoseconds (#796)

taralx · neild · commit 3337d2811975 · 2019-02-05T14:19:18.000-08:00
It is spec'd that way, but best practice is to avoid it.
diff --git a/ptypes/duration.go b/ptypes/duration.go
@@ -82,7 +82,7 @@ func Duration(p *durpb.Duration) (time.Duration, error) {
 		return 0, fmt.Errorf("duration: %v is out of range for time.Duration", p)
 	}
 	if p.Nanos != 0 {
-		d += time.Duration(p.Nanos)
+		d += time.Duration(p.Nanos) * time.Nanosecond
 		if (d < 0) != (p.Nanos < 0) {
 			return 0, fmt.Errorf("duration: %v is out of range for time.Duration", p)
 		}

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func Duration(p *durpb.Duration) (time.Duration, error) {`
`82`	`82`	`return 0, fmt.Errorf("duration: %v is out of range for time.Duration", p)`
`83`	`83`	`}`
`84`	`84`	`if p.Nanos != 0 {`
`85`		`- d += time.Duration(p.Nanos)`
	`85`	`+ d += time.Duration(p.Nanos) * time.Nanosecond`
`86`	`86`	`if (d < 0) != (p.Nanos < 0) {`
`87`	`87`	`return 0, fmt.Errorf("duration: %v is out of range for time.Duration", p)`
`88`	`88`	`}`