Merge branch 'master' into 5383-api-db-current-time

[arvados.git] / sdk / go / blockdigest / blockdigest.go

diff --git a/sdk/go/blockdigest/blockdigest.go b/sdk/go/blockdigest/blockdigest.go
index 5225af6554ee86353b7298887f4dbe33c814c7ec..9b818d365303ac6805c15be534400a0c3c854448 100644 (file)
--- a/sdk/go/blockdigest/blockdigest.go
+++ b/sdk/go/blockdigest/blockdigest.go
@@ -15,7 +15,7 @@ type BlockDigest struct {
        l uint64
 }
 
-func (d *BlockDigest) ToString() (s string) {
+func (d BlockDigest) String() string {
        return fmt.Sprintf("%016x%016x", d.h, d.l)
 }
 
@@ -28,9 +28,13 @@ func FromString(s string) (dig BlockDigest, err error) {
 
        var d BlockDigest
        d.h, err = strconv.ParseUint(s[:16], 16, 64)
-       if err != nil {return}
+       if err != nil {
+               return
+       }
        d.l, err = strconv.ParseUint(s[16:], 16, 64)
-       if err != nil {return}
+       if err != nil {
+               return
+       }
        dig = d
        return
 }