strip proto pkg name prefix

streamingfast · Dec 12, 2023 · 217d8cf · 217d8cf
1 parent 95496e9
commit 217d8cf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/service/tier1.go b/service/tier1.go
@@ -92,7 +92,8 @@ func getBlockTypeFromStreamFactory(sf *StreamFactory) (string, error) {
 			return "", err
 		}
 	}
-	return out, nil
+
+	return strings.TrimPrefix(out, protoPkfPrefix), nil
 }
 
 func NewTier1(

diff --git a/service/tier2.go b/service/tier2.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"strings"
 
 	"github.com/bufbuild/connect-go"
 	"github.com/streamingfast/bstream"
@@ -43,18 +44,20 @@ type Tier2Service struct {
 	logger            *zap.Logger
 }
 
+const protoPkfPrefix = "type.googleapis.com/"
+
 func getBlockTypeFromMergedBlocks(store dstore.Store) (string, error) {
 	var out string
 	fs := bstream.NewFileSource(store, bstream.GetProtocolFirstStreamableBlock, bstream.HandlerFunc(func(blk *pbbstream.Block, obj interface{}) error {
 		out = blk.Payload.TypeUrl
 		return io.EOF
 	}), zlog)
-
 	fs.Run()
+
 	if err := fs.Err(); err != io.EOF {
 		return "", err
 	}
-	return out, nil
+	return strings.TrimPrefix(out, protoPkfPrefix), nil
 }
 
 func NewTier2(