9005: Copy default transport if possible. Move magics to consts.

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

diff --git a/sdk/go/blockdigest/blockdigest.go b/sdk/go/blockdigest/blockdigest.go
index d2f1c60ba93889614de18756dcf3ed6608f0b5fa..cfc510cc6b1346fafa286271836f4d27f5e80e71 100644 (file)
--- a/sdk/go/blockdigest/blockdigest.go
+++ b/sdk/go/blockdigest/blockdigest.go
@@ -3,14 +3,13 @@ package blockdigest
 
 import (
        "fmt"
-       "log"
        "regexp"
        "strconv"
        "strings"
 )
 
 var LocatorPattern = regexp.MustCompile(
-       "^[0-9a-fA-F]{32}\\+[0-9]+(\\+[A-Z][A-Za-z0-9@_-]+)*$")
+       "^[0-9a-fA-F]{32}\\+[0-9]+(\\+[A-Z][A-Za-z0-9@_-]*)*$")
 
 // Stores a Block Locator Digest compactly, up to 128 bits.
 // Can be used as a map key.
@@ -58,15 +57,6 @@ func FromString(s string) (dig BlockDigest, err error) {
        return
 }
 
-// Will fatal with the error if an error is encountered
-func AssertFromString(s string) BlockDigest {
-       d, err := FromString(s)
-       if err != nil {
-               log.Fatalf("Error creating BlockDigest from %s: %v", s, err)
-       }
-       return d
-}
-
 func IsBlockLocator(s string) bool {
        return LocatorPattern.MatchString(s)
 }