Admin node (#131)

* WIP creating admin node service - WIP changing the process pkg to accept multiple services - WIP looping over services passed to process - add netstate/service.go file and abstract it for service processing * implement goroutine to launch each process * goroutines working with multiple services * code review fixes * more code updates for review * Add pkg lock and mod files back in * code review updates * update process.Main with better concurrent error handling * Update error handling and pass ctx to StartService * Update error handling with channel implementation * Merge in upstream changes - Simplify error handling channels * updates * Updates per reviewable * fix test * Setup test exec * Scaffold test setup * process main test working * update admin process test * Test multiple processes done * Add error classes for testing, test main logger error * Updates to tests * Update how process.Main() handles configs * Complete merge * Update Gopkg and add Copyright * Fix cyclical import issue - Added .coverprofile to gitignore - Update admin main.go function call * remove unnecessary line * Updates * DRY up cmd/netstate package * update service function calls * updates * Trying no-ops in examples * rename netstate to pointerdb * trying to fix merge * dep ensure and run tests * remove flag.Parse * Update deps * Skip offending test in pkg/process, to be fixed later
2018-07-09 16:43:32 -06:00 · 2018-07-09 16:43:32 -06:00 · 15960d4269
commit 15960d4269
parent 5b913c45b9
16 changed files with 471 additions and 542 deletions
--- a/.gitignore
+++ b/.gitignore
@ -32,3 +32,5 @@ vendor
 *test_redis-server.log
 *dump.rdb
 *test_bolt.db
+
+*.coverprofile
--- a/Gopkg.lock
+++ b/Gopkg.lock
@ -120,7 +120,7 @@
  branch = "master"
  name = "github.com/dvyukov/go-fuzz"
  packages = ["gen"]
-  revision = "d6e0377705f98dbae098a3cdcf74e89ce7c06a0c"
+  revision = "c2814e6bc6d77bf44add053ab5d92fdef86d6755"

 [[projects]]
  name = "github.com/eapache/go-resiliency"
@ -132,7 +132,7 @@
  branch = "master"
  name = "github.com/eapache/go-xerial-snappy"
  packages = ["."]
-  revision = "bb955e01b9346ac19dc29eb16586c90ded99a98c"
+  revision = "040cc1a32f578808623071247fdbd5cc43f37f5f"

 [[projects]]
  name = "github.com/eapache/queue"
@ -461,7 +461,7 @@
    "pkg/wildcard",
    "pkg/words"
  ]
-  revision = "360f3f93358ba2f1a2b8ae7d5ccb0a9fb8ea8579"
+  revision = "0ef0d7e685bd2fbe57bd0351e36649e971cc9a93"

 [[projects]]
  name = "github.com/minio/minio-go"
@ -474,8 +474,8 @@
    "pkg/s3utils",
    "pkg/set"
  ]
-  revision = "3adf3e30ef96aea8469c7aff8ef19ed38901817b"
-  version = "v6.0.4"
+  revision = "70799fe8dae6ecfb6c7d7e9e048fce27f23a1992"
+  version = "v6.0.5"

 [[projects]]
  branch = "master"
@ -608,7 +608,7 @@
    "nfs",
    "xfs"
  ]
-  revision = "40f013a808ec4fa79def444a1a56de4d1727efcb"
+  revision = "ae68e2d4c00fed4943b5f6698d504a5fe083da8a"

 [[projects]]
  branch = "master"
@ -712,9 +712,18 @@
  packages = ["."]
  revision = "e5adc2ada8b8efff032bf61173a233d143e9318e"

+[[projects]]
+  name = "github.com/stretchr/objx"
+  packages = ["."]
+  revision = "477a77ecc69700c7cdeb1fa9e129548e1c1c393c"
+  version = "v0.1.1"
+
 [[projects]]
  name = "github.com/stretchr/testify"
-  packages = ["assert"]
+  packages = [
+    "assert",
+    "mock"
+  ]
  revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
  version = "v1.2.2"

@ -847,7 +856,7 @@
    "trace",
    "websocket"
  ]
-  revision = "4cb1c02c05b0e749b0365f61ae859a8e0cfceed9"
+  revision = "32a936f46389aa10549d60bd7833e54b01685d09"

 [[projects]]
  branch = "master"
@ -857,7 +866,7 @@
    "unix",
    "windows"
  ]
-  revision = "7138fd3d9dc8335c567ca206f4333fb75eb05d56"
+  revision = "ce36f3865eeb42541ce3f87f32f8462c5687befa"

 [[projects]]
  name = "golang.org/x/text"
@ -1002,6 +1011,6 @@
 [solve-meta]
  analyzer-name = "dep"
  analyzer-version = 1
-  inputs-digest = "1b2413431f2936a7efd498bdd0995c13e625c3d53413d1fd8c50b5d98db34017"
+  inputs-digest = "9c05cf2ea65617806454427ce9caa5a36376912fd04575f7e0dcb554f257f6f1"
  solver-name = "gps-cdcl"
  solver-version = 1
--- a/cmd/admin/README.md
+++ b/cmd/admin/README.md
@ -0,0 +1,19 @@
+# Admin Node
+
+To start the admin node:
+
+```
+go run cmd/admin/main.go -redisAddress localhost:6379 -srvPort 8081
+```
+
+You need to set `redisAdress` to point to your local Redis instance, and `-srvPort` as something other than `8080`
+
+You should see output similar to this when everything is up and running:
+
+```
+> $ go run cmd/admin/main.go -redisAddress localhost:6379 -srvPort 8081                                                                                                                 ⬡ 8.9.3 [±admin ●●]
+bootstrapping cache
+unreachable: [214 170 31 194 250 116 19 142 148 84 87 81 130 188 112 183 225 69 55 214]
+[]
+unreachable: [214 170 31 194 250 116 19 142 148 84 87 81 130 188 112 183 225 69 55 214]
+unreachable: [214 170 31 194 250 116 19 142 148 84 87 81 130 188 112 183 225 69 55 214]```
--- a/cmd/admin/main.go
+++ b/cmd/admin/main.go
@ -0,0 +1,19 @@
+// Copyright (C) 2018 Storj Labs, Inc.
+// See LICENSE for copying information.
+
+package main
+
+import (
+	"log"
+
+	"storj.io/storj/pkg/overlay"
+	"storj.io/storj/pkg/pointerdb"
+	"storj.io/storj/pkg/process"
+)
+
+func main() {
+	err := process.Main(process.ConfigEnvironment, &overlay.Service{}, &pointerdb.Service{})
+	if err != nil {
+		log.Fatal(err)
+	}
+}
--- a/cmd/minio/main.go
+++ b/cmd/minio/main.go
@ -14,7 +14,7 @@ import (
 	"storj.io/storj/pkg/process"
 )

-func main() { process.Must(process.Main(process.ServiceFunc(run))) }
+func main() { process.Must(process.Main(process.ConfigEnvironment, process.ServiceFunc(run))) }

 func run(ctx context.Context, _ *cobra.Command, args []string) error {
 	cmd.Main(append([]string{os.Args[0]}, args...))
--- a/cmd/overlay/main.go
+++ b/cmd/overlay/main.go
@ -11,7 +11,7 @@ import (
 )

 func main() {
-	if err := process.Main(&overlay.Service{}); err != nil {
+	if err := process.Main(process.ConfigEnvironment, &overlay.Service{}); err != nil {
 		log.Fatal(err)
 	}
 }
--- a/cmd/pointerdb/main.go
+++ b/cmd/pointerdb/main.go
@ -4,76 +4,15 @@
 package main

 import (
-	"context"
-	"flag"
-	"fmt"
-	"net"
-
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"go.uber.org/zap"
-	"google.golang.org/grpc"
-	monkit "gopkg.in/spacemonkeygo/monkit.v2"
+	"log"

 	"storj.io/storj/pkg/pointerdb"
 	"storj.io/storj/pkg/process"
-	proto "storj.io/storj/protos/pointerdb"
-	"storj.io/storj/storage/boltdb"
 )

-var (
-	port   = flag.Int("port", 8080, "port")
-	dbPath = flag.String("db", "pointers.db", "db path")
-)
-
-func (s *serv) Process(ctx context.Context, _ *cobra.Command, _ []string) error {
-	bdb, err := boltdb.NewClient(s.logger, *dbPath, boltdb.PointerBucket)
-
-	if err != nil {
-		return err
-	}
-	defer bdb.Close()
-
-	// start grpc server
-	lis, err := net.Listen("tcp", fmt.Sprintf(":%d", *port))
-	if err != nil {
-		return err
-	}
-
-	grpcServer := grpc.NewServer()
-
-	proto.RegisterPointerDBServer(grpcServer, pointerdb.NewServer(bdb, s.logger))
-	s.logger.Debug(fmt.Sprintf("server listening on port %d", *port))
-
-	defer grpcServer.GracefulStop()
-	return grpcServer.Serve(lis)
-}
-
-type serv struct {
-	logger  *zap.Logger
-	metrics *monkit.Registry
-}
-
-func (s *serv) SetLogger(l *zap.Logger) error {
-	s.logger = l
-	return nil
-}
-
-func setEnv() error {
-	viper.SetEnvPrefix("api")
-	viper.BindEnv("key")
-	viper.AutomaticEnv()
-	return nil
-}
-
-func (s *serv) SetMetricHandler(m *monkit.Registry) error {
-	s.metrics = m
-	return nil
-}
-
-func (s *serv) InstanceID() string { return "" }
-
 func main() {
-	setEnv()
-	process.Must(process.Main(&serv{}))
+	err := process.Main(process.ConfigEnvironment, &pointerdb.Service{})
+	if err != nil {
+		log.Fatal(err)
+	}
 }
--- a/examples/metric-receiver/main.go
+++ b/examples/metric-receiver/main.go
@ -19,7 +19,7 @@ var (
 )

 func main() {
-	process.Must(process.Main(process.ServiceFunc(run)))
+	process.Must(process.Main(func() error { return nil }, process.ServiceFunc(run)))
 }

 func run(ctx context.Context, _ *cobra.Command, _ []string) error {
--- a/examples/metric-sender/main.go
+++ b/examples/metric-sender/main.go
@ -14,7 +14,7 @@ import (

 func main() {
 	flag.Set("metrics.interval", "1s")
-	process.Must(process.Main(process.ServiceFunc(run)))
+	process.Must(process.Main(func() error { return nil }, process.ServiceFunc(run)))
 }

 func run(ctx context.Context, _ *cobra.Command, _ []string) error {
--- a/examples/piecestore-cli/main.go
+++ b/examples/piecestore-cli/main.go
@ -144,4 +144,4 @@ func run(ctx context.Context, _ *cobra.Command, _ []string) error {
 	return app.Run(append([]string{os.Args[0]}, flag.Args()...))
 }

-func main() { process.Must(process.Main(process.ServiceFunc(run))) }
+func main() { process.Must(process.Main(func() error { return nil }, process.ServiceFunc(run))) }
--- a/pkg/overlay/cache.go
+++ b/pkg/overlay/cache.go
@ -5,10 +5,10 @@ package overlay

 import (
 	"context"
-	"fmt"

 	"github.com/gogo/protobuf/proto"
 	"github.com/zeebo/errs"
+	"go.uber.org/zap"

 	"storj.io/storj/pkg/dht"
 	"storj.io/storj/pkg/kademlia"
@ -18,8 +18,11 @@ import (
 	"storj.io/storj/storage/redis"
 )

-// ErrNodeNotFound standardizes errors here
-var ErrNodeNotFound = errs.Class("Node not found")
+// ErrNodeNotFound error standardization
+var ErrNodeNotFound = errs.New("Node not found")
+
+// OverlayError creates class of errors for stack traces
+var OverlayError = errs.Class("Overlay Error")

 // Cache is used to store overlay data in Redis
 type Cache struct {
@ -84,13 +87,16 @@ func (o *Cache) Put(nodeID string, value overlay.NodeAddress) error {

 // Bootstrap walks the initialized network and populates the cache
 func (o *Cache) Bootstrap(ctx context.Context) error {
-	fmt.Println("bootstrapping cache")
 	nodes, err := o.DHT.GetNodes(ctx, "0", 1280)

+	if err != nil {
+		zap.Error(OverlayError.New("Error getting nodes from DHT", err))
+	}
+
 	for _, v := range nodes {
 		found, err := o.DHT.FindNode(ctx, kademlia.StringToNodeID(v.Id))
 		if err != nil {
-			fmt.Println("could not find node in network", err, v.Id)
+			zap.Error(ErrNodeNotFound)
 		}
 		addr, err := proto.Marshal(found.Address)
 		o.DB.Put([]byte(found.Id), addr)
@ -143,8 +149,10 @@ func (o *Cache) Walk(ctx context.Context) error {
 	}

 	for _, v := range nodes {
-		if _, err := o.DHT.FindNode(ctx, kademlia.StringToNodeID(v.Id)); err != nil {
-			fmt.Println("could not find node in network", err, v.Id)
+		_, err := o.DHT.FindNode(ctx, kademlia.StringToNodeID(v.Id))
+		if err != nil {
+			zap.Error(ErrNodeNotFound)
+			return err
 		}
 	}

--- a/pkg/pointerdb/service.go
+++ b/pkg/pointerdb/service.go
@ -0,0 +1,79 @@
+// Copyright (C) 2018 Storj Labs, Inc.
+// See LICENSE for copying information.
+
+package pointerdb
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"net"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+	"go.uber.org/zap"
+	"google.golang.org/grpc"
+	monkit "gopkg.in/spacemonkeygo/monkit.v2"
+
+	proto "storj.io/storj/protos/pointerdb"
+	"storj.io/storj/storage/boltdb"
+)
+
+var (
+	port   = flag.Int("port", 8080, "port")
+	dbPath = flag.String("pointerdbDB", "pointerdb.db", "pointerdb db path")
+)
+
+// Process fits the `Process` interface for services
+func (s *Service) Process(ctx context.Context, _ *cobra.Command, _ []string) error {
+	if err := setEnv(); err != nil {
+		return err
+	}
+
+	bdb, err := boltdb.NewClient(s.logger, *dbPath, boltdb.PointerBucket)
+	if err != nil {
+		return err
+	}
+	defer bdb.Close()
+
+	// start grpc server
+	lis, err := net.Listen("tcp", fmt.Sprintf(":%d", *port))
+	if err != nil {
+		return err
+	}
+
+	grpcServer := grpc.NewServer()
+
+	proto.RegisterPointerDBServer(grpcServer, NewServer(bdb, s.logger))
+	s.logger.Debug(fmt.Sprintf("server listening on port %d", *port))
+
+	defer grpcServer.GracefulStop()
+	return grpcServer.Serve(lis)
+}
+
+// Service struct for process
+type Service struct {
+	logger  *zap.Logger
+	metrics *monkit.Registry
+}
+
+// SetLogger for process
+func (s *Service) SetLogger(l *zap.Logger) error {
+	s.logger = l
+	return nil
+}
+
+func setEnv() error {
+	viper.SetEnvPrefix("API")
+	viper.AutomaticEnv()
+	return nil
+}
+
+// SetMetricHandler for  process
+func (s *Service) SetMetricHandler(m *monkit.Registry) error {
+	s.metrics = m
+	return nil
+}
+
+// InstanceID assigns a new instance ID to the process
+func (s *Service) InstanceID() string { return "" }
--- a/pkg/process/exec.go
+++ b/pkg/process/exec.go
@ -4,6 +4,7 @@
 package process

 import (
+	"context"
 	"flag"
 	"fmt"
 	"log"
@ -50,10 +51,9 @@ func Execute(cmd *cobra.Command) {
 	Must(cmd.Execute())
 }

-// Main runs a Service
-func Main(s Service) error {
+// ConfigEnvironment sets up a standard Viper environment and parses CLI flags
+func ConfigEnvironment() error {
 	cfgFile := flag.String("config", defaultConfigPath(""), "config file")
-
 	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
 	pflag.Parse()
 	viper.BindPFlags(pflag.CommandLine)
@ -64,7 +64,28 @@ func Main(s Service) error {
 		viper.ReadInConfig()
 	}

-	return CtxService(s)(&cobra.Command{}, pflag.Args())
+	return nil
+}
+
+// Main runs a Service
+func Main(configFn func() error, s ...Service) error {
+	configFn()
+	ctx, cancel := context.WithCancel(context.Background())
+	errors := make(chan error, len(s))
+
+	for _, service := range s {
+		go func(ctx context.Context, s Service, ch <-chan error) {
+			errors <- CtxService(s)(&cobra.Command{}, pflag.Args())
+		}(ctx, service, errors)
+	}
+
+	select {
+	case <-ctx.Done():
+		return nil
+	case err := <-errors:
+		cancel()
+		return err
+	}
 }

 // Must checks for errors
--- a/pkg/process/exec_test.go
+++ b/pkg/process/exec_test.go
@ -0,0 +1,90 @@
+// Copyright (C) 2018 Storj Labs, Inc.
+// See LICENSE for copying information.
+
+package process_test
+
+import (
+	"context"
+	"testing"
+
+	"github.com/spf13/cobra"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"go.uber.org/zap"
+	monkit "gopkg.in/spacemonkeygo/monkit.v2"
+	"storj.io/storj/pkg/process"
+)
+
+type MockedService struct {
+	mock.Mock
+}
+
+func (m *MockedService) InstanceID() string {
+	return ""
+}
+
+func (m *MockedService) Process(ctx context.Context, cmd *cobra.Command, args []string) error {
+	arguments := m.Called(ctx, cmd, args)
+	return arguments.Error(0)
+}
+
+func (m *MockedService) SetLogger(*zap.Logger) error {
+	args := m.Called()
+	return args.Error(0)
+}
+
+func (m *MockedService) SetMetricHandler(*monkit.Registry) error {
+	args := m.Called()
+	return args.Error(0)
+}
+
+func TestMainSingleProcess(t *testing.T) {
+	mockService := new(MockedService)
+	mockService.On("SetLogger", mock.Anything).Return(nil)
+	mockService.On("SetMetricHandler", mock.Anything).Return(nil)
+	mockService.On("Process", mock.Anything, mock.Anything, mock.Anything).Return(nil)
+	assert.Nil(t, process.Main(func() error { return nil }, mockService))
+	mockService.AssertExpectations(t)
+}
+
+func TestMainMultipleProcess(t *testing.T) {
+	// TODO: Fix the async issues in this test
+	// mockService1 := MockedService{}
+	// mockService2 := MockedService{}
+
+	// mockService1.On("SetLogger", mock.Anything).Return(nil)
+	// mockService1.On("SetMetricHandler", mock.Anything).Return(nil)
+	// mockService1.On("Process", mock.Anything, mock.Anything, mock.Anything).Return(nil)
+
+	// mockService2.On("SetLogger", mock.Anything).Return(nil)
+	// mockService2.On("SetMetricHandler", mock.Anything).Return(nil)
+	// mockService2.On("Process", mock.Anything, mock.Anything, mock.Anything).Return(nil)
+
+	// assert.Nil(t, process.Main(func() error { return nil }, &mockService1, &mockService2))
+	// mockService1.AssertExpectations(t)
+	// mockService2.AssertExpectations(t)
+	t.Skip()
+}
+
+func TestMainProcessError(t *testing.T) {
+	mockService := MockedService{}
+
+	err := process.ErrLogger.New("Process Error")
+	mockService.On("SetLogger", mock.Anything).Return(nil)
+	mockService.On("SetMetricHandler", mock.Anything).Return(nil)
+	mockService.On("Process", mock.Anything, mock.Anything, mock.Anything).Return(err)
+	assert.Equal(t, err, process.Main(func() error { return nil }, &mockService))
+	mockService.AssertExpectations(t)
+}
+
+func TestConfigEnvironment(t *testing.T) {
+	t.Skip()
+}
+
+func TestMust(t *testing.T) {
+	t.Skip()
+}
+
+func TestExecute(t *testing.T) {
+	t.Skip()
+}
--- a/pkg/process/service.go
+++ b/pkg/process/service.go
@ -21,8 +21,19 @@ var (
 		"switch to 'prod' to get less output")

 	// Error is a process error class
-	Error    = errs.Class("proc error")
+	Error = errs.Class("proc error")
+
+	// ErrUsage is a process error class
 	ErrUsage = errs.Class("usage error")
+
+	// ErrLogger Class
+	ErrLogger = errs.Class("Logger Error")
+
+	// ErrMetricHandler Class
+	ErrMetricHandler = errs.Class("Metric Handler Error")
+
+	//ErrProcess Class
+	ErrProcess = errs.Class("Process Error")
 )

 type idKey string
--- a/protos/pointerdb/pointerdb.pb.go
+++ b/protos/pointerdb/pointerdb.pb.go
@ -1,12 +1,33 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: pointerdb.proto

+/*
+Package pointerdb is a generated protocol buffer package.
+
+It is generated from these files:
+	pointerdb.proto
+
+It has these top-level messages:
+	RedundancyScheme
+	EncryptionScheme
+	RemotePiece
+	RemoteSegment
+	Pointer
+	PutRequest
+	GetRequest
+	ListRequest
+	PutResponse
+	GetResponse
+	ListResponse
+	DeleteRequest
+	DeleteResponse
+*/
 package pointerdb

 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
+import google_protobuf "github.com/golang/protobuf/ptypes/timestamp"

 import (
 	context "golang.org/x/net/context"
@ -41,7 +62,7 @@ func (x RedundancyScheme_SchemeType) String() string {
 	return proto.EnumName(RedundancyScheme_SchemeType_name, int32(x))
 }
 func (RedundancyScheme_SchemeType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_pointerdb_525e73273472a0cd, []int{0, 0}
+	return fileDescriptor0, []int{0, 0}
 }

 type EncryptionScheme_EncryptionType int32
@ -64,7 +85,7 @@ func (x EncryptionScheme_EncryptionType) String() string {
 	return proto.EnumName(EncryptionScheme_EncryptionType_name, int32(x))
 }
 func (EncryptionScheme_EncryptionType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_pointerdb_525e73273472a0cd, []int{1, 0}
+	return fileDescriptor0, []int{1, 0}
 }

 type Pointer_DataType int32
@ -86,45 +107,21 @@ var Pointer_DataType_value = map[string]int32{
 func (x Pointer_DataType) String() string {
 	return proto.EnumName(Pointer_DataType_name, int32(x))
 }
-func (Pointer_DataType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_pointerdb_525e73273472a0cd, []int{4, 0}
-}
+func (Pointer_DataType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{4, 0} }

 type RedundancyScheme struct {
-	Type RedundancyScheme_SchemeType `protobuf:"varint,1,opt,name=type,proto3,enum=pointerdb.RedundancyScheme_SchemeType" json:"type,omitempty"`
+	Type RedundancyScheme_SchemeType `protobuf:"varint,1,opt,name=type,enum=pointerdb.RedundancyScheme_SchemeType" json:"type,omitempty"`
 	// these values apply to RS encoding
-	MinReq               int64    `protobuf:"varint,2,opt,name=min_req,json=minReq,proto3" json:"min_req,omitempty"`
-	Total                int64    `protobuf:"varint,3,opt,name=total,proto3" json:"total,omitempty"`
-	RepairThreshold      int64    `protobuf:"varint,4,opt,name=repair_threshold,json=repairThreshold,proto3" json:"repair_threshold,omitempty"`
-	SuccessThreshold     int64    `protobuf:"varint,5,opt,name=success_threshold,json=successThreshold,proto3" json:"success_threshold,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	MinReq           int64 `protobuf:"varint,2,opt,name=min_req,json=minReq" json:"min_req,omitempty"`
+	Total            int64 `protobuf:"varint,3,opt,name=total" json:"total,omitempty"`
+	RepairThreshold  int64 `protobuf:"varint,4,opt,name=repair_threshold,json=repairThreshold" json:"repair_threshold,omitempty"`
+	SuccessThreshold int64 `protobuf:"varint,5,opt,name=success_threshold,json=successThreshold" json:"success_threshold,omitempty"`
 }

-func (m *RedundancyScheme) Reset()         { *m = RedundancyScheme{} }
-func (m *RedundancyScheme) String() string { return proto.CompactTextString(m) }
-func (*RedundancyScheme) ProtoMessage()    {}
-func (*RedundancyScheme) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pointerdb_525e73273472a0cd, []int{0}
-}
-func (m *RedundancyScheme) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_RedundancyScheme.Unmarshal(m, b)
-}
-func (m *RedundancyScheme) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_RedundancyScheme.Marshal(b, m, deterministic)
-}
-func (dst *RedundancyScheme) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RedundancyScheme.Merge(dst, src)
-}
-func (m *RedundancyScheme) XXX_Size() int {
-	return xxx_messageInfo_RedundancyScheme.Size(m)
-}
-func (m *RedundancyScheme) XXX_DiscardUnknown() {
-	xxx_messageInfo_RedundancyScheme.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_RedundancyScheme proto.InternalMessageInfo
+func (m *RedundancyScheme) Reset()                    { *m = RedundancyScheme{} }
+func (m *RedundancyScheme) String() string            { return proto.CompactTextString(m) }
+func (*RedundancyScheme) ProtoMessage()               {}
+func (*RedundancyScheme) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }

 func (m *RedundancyScheme) GetType() RedundancyScheme_SchemeType {
 	if m != nil {
@ -162,37 +159,15 @@ func (m *RedundancyScheme) GetSuccessThreshold() int64 {
 }

 type EncryptionScheme struct {
-	Type                   EncryptionScheme_EncryptionType `protobuf:"varint,1,opt,name=type,proto3,enum=pointerdb.EncryptionScheme_EncryptionType" json:"type,omitempty"`
+	Type                   EncryptionScheme_EncryptionType `protobuf:"varint,1,opt,name=type,enum=pointerdb.EncryptionScheme_EncryptionType" json:"type,omitempty"`
 	EncryptedEncryptionKey []byte                          `protobuf:"bytes,2,opt,name=encrypted_encryption_key,json=encryptedEncryptionKey,proto3" json:"encrypted_encryption_key,omitempty"`
 	EncryptedStartingNonce []byte                          `protobuf:"bytes,3,opt,name=encrypted_starting_nonce,json=encryptedStartingNonce,proto3" json:"encrypted_starting_nonce,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                        `json:"-"`
-	XXX_unrecognized       []byte                          `json:"-"`
-	XXX_sizecache          int32                           `json:"-"`
 }

-func (m *EncryptionScheme) Reset()         { *m = EncryptionScheme{} }
-func (m *EncryptionScheme) String() string { return proto.CompactTextString(m) }
-func (*EncryptionScheme) ProtoMessage()    {}
-func (*EncryptionScheme) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pointerdb_525e73273472a0cd, []int{1}
-}
-func (m *EncryptionScheme) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_EncryptionScheme.Unmarshal(m, b)
-}
-func (m *EncryptionScheme) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_EncryptionScheme.Marshal(b, m, deterministic)
-}
-func (dst *EncryptionScheme) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EncryptionScheme.Merge(dst, src)
-}
-func (m *EncryptionScheme) XXX_Size() int {
-	return xxx_messageInfo_EncryptionScheme.Size(m)
-}
-func (m *EncryptionScheme) XXX_DiscardUnknown() {
-	xxx_messageInfo_EncryptionScheme.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_EncryptionScheme proto.InternalMessageInfo
+func (m *EncryptionScheme) Reset()                    { *m = EncryptionScheme{} }
+func (m *EncryptionScheme) String() string            { return proto.CompactTextString(m) }
+func (*EncryptionScheme) ProtoMessage()               {}
+func (*EncryptionScheme) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }

 func (m *EncryptionScheme) GetType() EncryptionScheme_EncryptionType {
 	if m != nil {
@ -216,36 +191,14 @@ func (m *EncryptionScheme) GetEncryptedStartingNonce() []byte {
 }

 type RemotePiece struct {
-	PieceNum             int64    `protobuf:"varint,1,opt,name=piece_num,json=pieceNum,proto3" json:"piece_num,omitempty"`
-	NodeId               string   `protobuf:"bytes,2,opt,name=node_id,json=nodeId,proto3" json:"node_id,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	PieceNum int64  `protobuf:"varint,1,opt,name=piece_num,json=pieceNum" json:"piece_num,omitempty"`
+	NodeId   string `protobuf:"bytes,2,opt,name=node_id,json=nodeId" json:"node_id,omitempty"`
 }

-func (m *RemotePiece) Reset()         { *m = RemotePiece{} }
-func (m *RemotePiece) String() string { return proto.CompactTextString(m) }
-func (*RemotePiece) ProtoMessage()    {}
-func (*RemotePiece) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pointerdb_525e73273472a0cd, []int{2}
-}
-func (m *RemotePiece) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_RemotePiece.Unmarshal(m, b)
-}
-func (m *RemotePiece) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_RemotePiece.Marshal(b, m, deterministic)
-}
-func (dst *RemotePiece) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RemotePiece.Merge(dst, src)
-}
-func (m *RemotePiece) XXX_Size() int {
-	return xxx_messageInfo_RemotePiece.Size(m)
-}
-func (m *RemotePiece) XXX_DiscardUnknown() {
-	xxx_messageInfo_RemotePiece.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_RemotePiece proto.InternalMessageInfo
+func (m *RemotePiece) Reset()                    { *m = RemotePiece{} }
+func (m *RemotePiece) String() string            { return proto.CompactTextString(m) }
+func (*RemotePiece) ProtoMessage()               {}
+func (*RemotePiece) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }

 func (m *RemotePiece) GetPieceNum() int64 {
 	if m != nil {
@ -262,38 +215,16 @@ func (m *RemotePiece) GetNodeId() string {
 }

 type RemoteSegment struct {
-	Redundancy           *RedundancyScheme `protobuf:"bytes,1,opt,name=redundancy,proto3" json:"redundancy,omitempty"`
-	PieceId              string            `protobuf:"bytes,2,opt,name=piece_id,json=pieceId,proto3" json:"piece_id,omitempty"`
-	RemotePieces         []*RemotePiece    `protobuf:"bytes,3,rep,name=remote_pieces,json=remotePieces,proto3" json:"remote_pieces,omitempty"`
-	MerkleRoot           []byte            `protobuf:"bytes,4,opt,name=merkle_root,json=merkleRoot,proto3" json:"merkle_root,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
-	XXX_unrecognized     []byte            `json:"-"`
-	XXX_sizecache        int32             `json:"-"`
+	Redundancy   *RedundancyScheme `protobuf:"bytes,1,opt,name=redundancy" json:"redundancy,omitempty"`
+	PieceId      string            `protobuf:"bytes,2,opt,name=piece_id,json=pieceId" json:"piece_id,omitempty"`
+	RemotePieces []*RemotePiece    `protobuf:"bytes,3,rep,name=remote_pieces,json=remotePieces" json:"remote_pieces,omitempty"`
+	MerkleRoot   []byte            `protobuf:"bytes,4,opt,name=merkle_root,json=merkleRoot,proto3" json:"merkle_root,omitempty"`
 }

-func (m *RemoteSegment) Reset()         { *m = RemoteSegment{} }
-func (m *RemoteSegment) String() string { return proto.CompactTextString(m) }
-func (*RemoteSegment) ProtoMessage()    {}
-func (*RemoteSegment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pointerdb_525e73273472a0cd, []int{3}
-}
-func (m *RemoteSegment) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_RemoteSegment.Unmarshal(m, b)
-}
-func (m *RemoteSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_RemoteSegment.Marshal(b, m, deterministic)
-}
-func (dst *RemoteSegment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RemoteSegment.Merge(dst, src)
-}
-func (m *RemoteSegment) XXX_Size() int {
-	return xxx_messageInfo_RemoteSegment.Size(m)
-}
-func (m *RemoteSegment) XXX_DiscardUnknown() {
-	xxx_messageInfo_RemoteSegment.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_RemoteSegment proto.InternalMessageInfo
+func (m *RemoteSegment) Reset()                    { *m = RemoteSegment{} }
+func (m *RemoteSegment) String() string            { return proto.CompactTextString(m) }
+func (*RemoteSegment) ProtoMessage()               {}
+func (*RemoteSegment) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }

 func (m *RemoteSegment) GetRedundancy() *RedundancyScheme {
 	if m != nil {
@ -324,41 +255,19 @@ func (m *RemoteSegment) GetMerkleRoot() []byte {
 }

 type Pointer struct {
-	Type                 Pointer_DataType     `protobuf:"varint,1,opt,name=type,proto3,enum=pointerdb.Pointer_DataType" json:"type,omitempty"`
-	InlineSegment        []byte               `protobuf:"bytes,3,opt,name=inline_segment,json=inlineSegment,proto3" json:"inline_segment,omitempty"`
-	Remote               *RemoteSegment       `protobuf:"bytes,4,opt,name=remote,proto3" json:"remote,omitempty"`
-	Size                 int64                `protobuf:"varint,5,opt,name=size,proto3" json:"size,omitempty"`
-	CreationDate         *timestamp.Timestamp `protobuf:"bytes,6,opt,name=creation_date,json=creationDate,proto3" json:"creation_date,omitempty"`
-	ExpirationDate       *timestamp.Timestamp `protobuf:"bytes,7,opt,name=expiration_date,json=expirationDate,proto3" json:"expiration_date,omitempty"`
-	Metadata             []byte               `protobuf:"bytes,8,opt,name=metadata,proto3" json:"metadata,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
-	XXX_unrecognized     []byte               `json:"-"`
-	XXX_sizecache        int32                `json:"-"`
+	Type           Pointer_DataType           `protobuf:"varint,1,opt,name=type,enum=pointerdb.Pointer_DataType" json:"type,omitempty"`
+	InlineSegment  []byte                     `protobuf:"bytes,3,opt,name=inline_segment,json=inlineSegment,proto3" json:"inline_segment,omitempty"`
+	Remote         *RemoteSegment             `protobuf:"bytes,4,opt,name=remote" json:"remote,omitempty"`
+	Size           int64                      `protobuf:"varint,5,opt,name=size" json:"size,omitempty"`
+	CreationDate   *google_protobuf.Timestamp `protobuf:"bytes,6,opt,name=creation_date,json=creationDate" json:"creation_date,omitempty"`
+	ExpirationDate *google_protobuf.Timestamp `protobuf:"bytes,7,opt,name=expiration_date,json=expirationDate" json:"expiration_date,omitempty"`
+	Metadata       []byte                     `protobuf:"bytes,8,opt,name=metadata,proto3" json:"metadata,omitempty"`
 }

-func (m *Pointer) Reset()         { *m = Pointer{} }
-func (m *Pointer) String() string { return proto.CompactTextString(m) }
-func (*Pointer) ProtoMessage()    {}
-func (*Pointer) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pointerdb_525e73273472a0cd, []int{4}
-}
-func (m *Pointer) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Pointer.Unmarshal(m, b)
-}
-func (m *Pointer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Pointer.Marshal(b, m, deterministic)
-}
-func (dst *Pointer) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Pointer.Merge(dst, src)
-}
-func (m *Pointer) XXX_Size() int {
-	return xxx_messageInfo_Pointer.Size(m)
-}
-func (m *Pointer) XXX_DiscardUnknown() {
-	xxx_messageInfo_Pointer.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Pointer proto.InternalMessageInfo
+func (m *Pointer) Reset()                    { *m = Pointer{} }
+func (m *Pointer) String() string            { return proto.CompactTextString(m) }
+func (*Pointer) ProtoMessage()               {}
+func (*Pointer) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }

 func (m *Pointer) GetType() Pointer_DataType {
 	if m != nil {
@ -388,14 +297,14 @@ func (m *Pointer) GetSize() int64 {
 	return 0
 }

-func (m *Pointer) GetCreationDate() *timestamp.Timestamp {
+func (m *Pointer) GetCreationDate() *google_protobuf.Timestamp {
 	if m != nil {
 		return m.CreationDate
 	}
 	return nil
 }

-func (m *Pointer) GetExpirationDate() *timestamp.Timestamp {
+func (m *Pointer) GetExpirationDate() *google_protobuf.Timestamp {
 	if m != nil {
 		return m.ExpirationDate
 	}
@ -411,37 +320,15 @@ func (m *Pointer) GetMetadata() []byte {

 // PutRequest is a request message for the Put rpc call
 type PutRequest struct {
-	Path                 []byte   `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
-	Pointer              *Pointer `protobuf:"bytes,2,opt,name=pointer,proto3" json:"pointer,omitempty"`
-	APIKey               []byte   `protobuf:"bytes,3,opt,name=APIKey,proto3" json:"APIKey,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Path    []byte   `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
+	Pointer *Pointer `protobuf:"bytes,2,opt,name=pointer" json:"pointer,omitempty"`
+	APIKey  []byte   `protobuf:"bytes,3,opt,name=APIKey,proto3" json:"APIKey,omitempty"`
 }

-func (m *PutRequest) Reset()         { *m = PutRequest{} }
-func (m *PutRequest) String() string { return proto.CompactTextString(m) }
-func (*PutRequest) ProtoMessage()    {}
-func (*PutRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pointerdb_525e73273472a0cd, []int{5}
-}
-func (m *PutRequest) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_PutRequest.Unmarshal(m, b)
-}
-func (m *PutRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_PutRequest.Marshal(b, m, deterministic)
-}
-func (dst *PutRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PutRequest.Merge(dst, src)
-}
-func (m *PutRequest) XXX_Size() int {
-	return xxx_messageInfo_PutRequest.Size(m)
-}
-func (m *PutRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_PutRequest.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_PutRequest proto.InternalMessageInfo
+func (m *PutRequest) Reset()                    { *m = PutRequest{} }
+func (m *PutRequest) String() string            { return proto.CompactTextString(m) }
+func (*PutRequest) ProtoMessage()               {}
+func (*PutRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }

 func (m *PutRequest) GetPath() []byte {
 	if m != nil {
@ -466,36 +353,14 @@ func (m *PutRequest) GetAPIKey() []byte {

 // GetRequest is a request message for the Get rpc call
 type GetRequest struct {
-	Path                 []byte   `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
-	APIKey               []byte   `protobuf:"bytes,2,opt,name=APIKey,proto3" json:"APIKey,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Path   []byte `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
+	APIKey []byte `protobuf:"bytes,2,opt,name=APIKey,proto3" json:"APIKey,omitempty"`
 }

-func (m *GetRequest) Reset()         { *m = GetRequest{} }
-func (m *GetRequest) String() string { return proto.CompactTextString(m) }
-func (*GetRequest) ProtoMessage()    {}
-func (*GetRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pointerdb_525e73273472a0cd, []int{6}
-}
-func (m *GetRequest) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_GetRequest.Unmarshal(m, b)
-}
-func (m *GetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_GetRequest.Marshal(b, m, deterministic)
-}
-func (dst *GetRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetRequest.Merge(dst, src)
-}
-func (m *GetRequest) XXX_Size() int {
-	return xxx_messageInfo_GetRequest.Size(m)
-}
-func (m *GetRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_GetRequest.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_GetRequest proto.InternalMessageInfo
+func (m *GetRequest) Reset()                    { *m = GetRequest{} }
+func (m *GetRequest) String() string            { return proto.CompactTextString(m) }
+func (*GetRequest) ProtoMessage()               {}
+func (*GetRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }

 func (m *GetRequest) GetPath() []byte {
 	if m != nil {
@ -513,37 +378,15 @@ func (m *GetRequest) GetAPIKey() []byte {

 // ListRequest is a request message for the List rpc call
 type ListRequest struct {
-	StartingPathKey      []byte   `protobuf:"bytes,1,opt,name=starting_path_key,json=startingPathKey,proto3" json:"starting_path_key,omitempty"`
-	Limit                int64    `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"`
-	APIKey               []byte   `protobuf:"bytes,3,opt,name=APIKey,proto3" json:"APIKey,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	StartingPathKey []byte `protobuf:"bytes,1,opt,name=starting_path_key,json=startingPathKey,proto3" json:"starting_path_key,omitempty"`
+	Limit           int64  `protobuf:"varint,2,opt,name=limit" json:"limit,omitempty"`
+	APIKey          []byte `protobuf:"bytes,3,opt,name=APIKey,proto3" json:"APIKey,omitempty"`
 }

-func (m *ListRequest) Reset()         { *m = ListRequest{} }
-func (m *ListRequest) String() string { return proto.CompactTextString(m) }
-func (*ListRequest) ProtoMessage()    {}
-func (*ListRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pointerdb_525e73273472a0cd, []int{7}
-}
-func (m *ListRequest) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ListRequest.Unmarshal(m, b)
-}
-func (m *ListRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ListRequest.Marshal(b, m, deterministic)
-}
-func (dst *ListRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListRequest.Merge(dst, src)
-}
-func (m *ListRequest) XXX_Size() int {
-	return xxx_messageInfo_ListRequest.Size(m)
-}
-func (m *ListRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_ListRequest.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ListRequest proto.InternalMessageInfo
+func (m *ListRequest) Reset()                    { *m = ListRequest{} }
+func (m *ListRequest) String() string            { return proto.CompactTextString(m) }
+func (*ListRequest) ProtoMessage()               {}
+func (*ListRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }

 func (m *ListRequest) GetStartingPathKey() []byte {
 	if m != nil {
@ -568,66 +411,22 @@ func (m *ListRequest) GetAPIKey() []byte {

 // PutResponse is a response message for the Put rpc call
 type PutResponse struct {
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
 }

-func (m *PutResponse) Reset()         { *m = PutResponse{} }
-func (m *PutResponse) String() string { return proto.CompactTextString(m) }
-func (*PutResponse) ProtoMessage()    {}
-func (*PutResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pointerdb_525e73273472a0cd, []int{8}
-}
-func (m *PutResponse) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_PutResponse.Unmarshal(m, b)
-}
-func (m *PutResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_PutResponse.Marshal(b, m, deterministic)
-}
-func (dst *PutResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PutResponse.Merge(dst, src)
-}
-func (m *PutResponse) XXX_Size() int {
-	return xxx_messageInfo_PutResponse.Size(m)
-}
-func (m *PutResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_PutResponse.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_PutResponse proto.InternalMessageInfo
+func (m *PutResponse) Reset()                    { *m = PutResponse{} }
+func (m *PutResponse) String() string            { return proto.CompactTextString(m) }
+func (*PutResponse) ProtoMessage()               {}
+func (*PutResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }

 // GetResponse is a response message for the Get rpc call
 type GetResponse struct {
-	Pointer              []byte   `protobuf:"bytes,1,opt,name=pointer,proto3" json:"pointer,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Pointer []byte `protobuf:"bytes,1,opt,name=pointer,proto3" json:"pointer,omitempty"`
 }

-func (m *GetResponse) Reset()         { *m = GetResponse{} }
-func (m *GetResponse) String() string { return proto.CompactTextString(m) }
-func (*GetResponse) ProtoMessage()    {}
-func (*GetResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pointerdb_525e73273472a0cd, []int{9}
-}
-func (m *GetResponse) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_GetResponse.Unmarshal(m, b)
-}
-func (m *GetResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_GetResponse.Marshal(b, m, deterministic)
-}
-func (dst *GetResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GetResponse.Merge(dst, src)
-}
-func (m *GetResponse) XXX_Size() int {
-	return xxx_messageInfo_GetResponse.Size(m)
-}
-func (m *GetResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_GetResponse.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_GetResponse proto.InternalMessageInfo
+func (m *GetResponse) Reset()                    { *m = GetResponse{} }
+func (m *GetResponse) String() string            { return proto.CompactTextString(m) }
+func (*GetResponse) ProtoMessage()               {}
+func (*GetResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }

 func (m *GetResponse) GetPointer() []byte {
 	if m != nil {
@ -638,36 +437,14 @@ func (m *GetResponse) GetPointer() []byte {

 // ListResponse is a response message for the List rpc call
 type ListResponse struct {
-	Paths                [][]byte `protobuf:"bytes,1,rep,name=paths,proto3" json:"paths,omitempty"`
-	Truncated            bool     `protobuf:"varint,2,opt,name=truncated,proto3" json:"truncated,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Paths     [][]byte `protobuf:"bytes,1,rep,name=paths,proto3" json:"paths,omitempty"`
+	Truncated bool     `protobuf:"varint,2,opt,name=truncated" json:"truncated,omitempty"`
 }

-func (m *ListResponse) Reset()         { *m = ListResponse{} }
-func (m *ListResponse) String() string { return proto.CompactTextString(m) }
-func (*ListResponse) ProtoMessage()    {}
-func (*ListResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pointerdb_525e73273472a0cd, []int{10}
-}
-func (m *ListResponse) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ListResponse.Unmarshal(m, b)
-}
-func (m *ListResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ListResponse.Marshal(b, m, deterministic)
-}
-func (dst *ListResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListResponse.Merge(dst, src)
-}
-func (m *ListResponse) XXX_Size() int {
-	return xxx_messageInfo_ListResponse.Size(m)
-}
-func (m *ListResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_ListResponse.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ListResponse proto.InternalMessageInfo
+func (m *ListResponse) Reset()                    { *m = ListResponse{} }
+func (m *ListResponse) String() string            { return proto.CompactTextString(m) }
+func (*ListResponse) ProtoMessage()               {}
+func (*ListResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }

 func (m *ListResponse) GetPaths() [][]byte {
 	if m != nil {
@ -684,36 +461,14 @@ func (m *ListResponse) GetTruncated() bool {
 }

 type DeleteRequest struct {
-	Path                 []byte   `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
-	APIKey               []byte   `protobuf:"bytes,2,opt,name=APIKey,proto3" json:"APIKey,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Path   []byte `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
+	APIKey []byte `protobuf:"bytes,2,opt,name=APIKey,proto3" json:"APIKey,omitempty"`
 }

-func (m *DeleteRequest) Reset()         { *m = DeleteRequest{} }
-func (m *DeleteRequest) String() string { return proto.CompactTextString(m) }
-func (*DeleteRequest) ProtoMessage()    {}
-func (*DeleteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pointerdb_525e73273472a0cd, []int{11}
-}
-func (m *DeleteRequest) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_DeleteRequest.Unmarshal(m, b)
-}
-func (m *DeleteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_DeleteRequest.Marshal(b, m, deterministic)
-}
-func (dst *DeleteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteRequest.Merge(dst, src)
-}
-func (m *DeleteRequest) XXX_Size() int {
-	return xxx_messageInfo_DeleteRequest.Size(m)
-}
-func (m *DeleteRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_DeleteRequest.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_DeleteRequest proto.InternalMessageInfo
+func (m *DeleteRequest) Reset()                    { *m = DeleteRequest{} }
+func (m *DeleteRequest) String() string            { return proto.CompactTextString(m) }
+func (*DeleteRequest) ProtoMessage()               {}
+func (*DeleteRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }

 func (m *DeleteRequest) GetPath() []byte {
 	if m != nil {
@ -731,34 +486,12 @@ func (m *DeleteRequest) GetAPIKey() []byte {

 // DeleteResponse is a response message for the Delete rpc call
 type DeleteResponse struct {
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
 }

-func (m *DeleteResponse) Reset()         { *m = DeleteResponse{} }
-func (m *DeleteResponse) String() string { return proto.CompactTextString(m) }
-func (*DeleteResponse) ProtoMessage()    {}
-func (*DeleteResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_pointerdb_525e73273472a0cd, []int{12}
-}
-func (m *DeleteResponse) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_DeleteResponse.Unmarshal(m, b)
-}
-func (m *DeleteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_DeleteResponse.Marshal(b, m, deterministic)
-}
-func (dst *DeleteResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DeleteResponse.Merge(dst, src)
-}
-func (m *DeleteResponse) XXX_Size() int {
-	return xxx_messageInfo_DeleteResponse.Size(m)
-}
-func (m *DeleteResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_DeleteResponse.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_DeleteResponse proto.InternalMessageInfo
+func (m *DeleteResponse) Reset()                    { *m = DeleteResponse{} }
+func (m *DeleteResponse) String() string            { return proto.CompactTextString(m) }
+func (*DeleteResponse) ProtoMessage()               {}
+func (*DeleteResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }

 func init() {
 	proto.RegisterType((*RedundancyScheme)(nil), "pointerdb.RedundancyScheme")
@ -787,9 +520,8 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4

-// PointerDBClient is the client API for PointerDB service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+// Client API for PointerDB service
+
 type PointerDBClient interface {
 	// Put formats and hands off a file path to be saved to boltdb
 	Put(ctx context.Context, in *PutRequest, opts ...grpc.CallOption) (*PutResponse, error)
@ -801,51 +533,52 @@ type PointerDBClient interface {
 	Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error)
 }

-type pointerDBClient struct {
+type netStateClient struct {
 	cc *grpc.ClientConn
 }

 func NewPointerDBClient(cc *grpc.ClientConn) PointerDBClient {
-	return &pointerDBClient{cc}
+	return &netStateClient{cc}
 }

-func (c *pointerDBClient) Put(ctx context.Context, in *PutRequest, opts ...grpc.CallOption) (*PutResponse, error) {
+func (c *netStateClient) Put(ctx context.Context, in *PutRequest, opts ...grpc.CallOption) (*PutResponse, error) {
 	out := new(PutResponse)
-	err := c.cc.Invoke(ctx, "/pointerdb.PointerDB/Put", in, out, opts...)
+	err := grpc.Invoke(ctx, "/pointerdb.PointerDB/Put", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }

-func (c *pointerDBClient) Get(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*GetResponse, error) {
+func (c *netStateClient) Get(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*GetResponse, error) {
 	out := new(GetResponse)
-	err := c.cc.Invoke(ctx, "/pointerdb.PointerDB/Get", in, out, opts...)
+	err := grpc.Invoke(ctx, "/pointerdb.PointerDB/Get", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }

-func (c *pointerDBClient) List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error) {
+func (c *netStateClient) List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error) {
 	out := new(ListResponse)
-	err := c.cc.Invoke(ctx, "/pointerdb.PointerDB/List", in, out, opts...)
+	err := grpc.Invoke(ctx, "/pointerdb.PointerDB/List", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }

-func (c *pointerDBClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) {
+func (c *netStateClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) {
 	out := new(DeleteResponse)
-	err := c.cc.Invoke(ctx, "/pointerdb.PointerDB/Delete", in, out, opts...)
+	err := grpc.Invoke(ctx, "/pointerdb.PointerDB/Delete", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }

-// PointerDBServer is the server API for PointerDB service.
+// Server API for PointerDB service
+
 type PointerDBServer interface {
 	// Put formats and hands off a file path to be saved to boltdb
 	Put(context.Context, *PutRequest) (*PutResponse, error)
@ -958,62 +691,61 @@ var _PointerDB_serviceDesc = grpc.ServiceDesc{
 	Metadata: "pointerdb.proto",
 }

-func init() { proto.RegisterFile("pointerdb.proto", fileDescriptor_pointerdb_525e73273472a0cd) }
+func init() { proto.RegisterFile("pointerdb.proto", fileDescriptor0) }

-var fileDescriptor_pointerdb_525e73273472a0cd = []byte{
-	// 859 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x5f, 0x6f, 0xdb, 0x46,
-	0x0c, 0x8f, 0xa2, 0x44, 0xb6, 0x29, 0xdb, 0x51, 0x0f, 0x59, 0xaa, 0xba, 0x03, 0x1a, 0x08, 0xd8,
-	0x96, 0xb5, 0x83, 0x33, 0x78, 0x05, 0x56, 0x2c, 0xd8, 0x86, 0x26, 0x31, 0x02, 0xa3, 0x6d, 0x6a,
-	0x9c, 0xfd, 0xb0, 0x37, 0x41, 0x91, 0x58, 0x5b, 0xa8, 0x75, 0x52, 0xa4, 0x13, 0x30, 0xef, 0xfb,
-	0xed, 0xd3, 0x0c, 0xc3, 0x1e, 0xf6, 0x05, 0x06, 0xdd, 0x9d, 0xfe, 0x25, 0x5b, 0x06, 0xf4, 0xc9,
-	0x22, 0xf9, 0xfb, 0xf1, 0xc8, 0x1f, 0x49, 0xc3, 0x41, 0x12, 0x87, 0x8c, 0x63, 0x1a, 0xdc, 0x8c,
-	0x93, 0x34, 0xe6, 0x31, 0xe9, 0x55, 0x8e, 0xd1, 0xb3, 0x55, 0x1c, 0xaf, 0x36, 0x78, 0x2a, 0x02,
-	0x37, 0xf9, 0x87, 0x53, 0x1e, 0x46, 0x98, 0x71, 0x2f, 0x4a, 0x24, 0xd6, 0xf9, 0x43, 0x03, 0x8b,
-	0x62, 0x90, 0xb3, 0xc0, 0x63, 0xfe, 0x76, 0xe1, 0xaf, 0x31, 0x42, 0xf2, 0x03, 0xec, 0xf1, 0x6d,
-	0x82, 0xb6, 0x76, 0xac, 0x9d, 0x0c, 0x27, 0x5f, 0x8e, 0xeb, 0x07, 0xee, 0x42, 0xc7, 0xf2, 0x67,
-	0xb9, 0x4d, 0x90, 0x0a, 0x0e, 0x79, 0x0c, 0x9d, 0x28, 0x64, 0x6e, 0x8a, 0xb7, 0xf6, 0xee, 0xb1,
-	0x76, 0xa2, 0x53, 0x23, 0x0a, 0x19, 0xc5, 0x5b, 0x72, 0x08, 0xfb, 0x3c, 0xe6, 0xde, 0xc6, 0xd6,
-	0x85, 0x5b, 0x1a, 0xe4, 0x6b, 0xb0, 0x52, 0x4c, 0xbc, 0x30, 0x75, 0xf9, 0x3a, 0xc5, 0x6c, 0x1d,
-	0x6f, 0x02, 0x7b, 0x4f, 0x00, 0x0e, 0xa4, 0x7f, 0x59, 0xba, 0xc9, 0x0b, 0x78, 0x94, 0xe5, 0xbe,
-	0x8f, 0x59, 0xd6, 0xc0, 0xee, 0x0b, 0xac, 0xa5, 0x02, 0x15, 0xd8, 0x39, 0x04, 0xa8, 0x4b, 0x23,
-	0x06, 0xec, 0xd2, 0x85, 0xb5, 0xe3, 0xfc, 0xad, 0x81, 0x35, 0x65, 0x7e, 0xba, 0x4d, 0x78, 0x18,
-	0x33, 0xd5, 0xed, 0x4f, 0xad, 0x6e, 0x9f, 0x37, 0xba, 0xbd, 0x0b, 0x6d, 0x38, 0x1a, 0x1d, 0xbf,
-	0x02, 0x1b, 0xa5, 0x1f, 0x03, 0x17, 0x2b, 0x84, 0xfb, 0x11, 0xb7, 0x42, 0x82, 0x3e, 0x3d, 0xaa,
-	0xe2, 0x75, 0x82, 0x37, 0xb8, 0x6d, 0x33, 0x33, 0xee, 0xa5, 0x3c, 0x64, 0x2b, 0x97, 0xc5, 0xcc,
-	0x47, 0xa1, 0x52, 0x93, 0xb9, 0x50, 0xe1, 0xeb, 0x22, 0xea, 0xbc, 0x80, 0x61, 0xbb, 0x16, 0x02,
-	0x60, 0xbc, 0x9e, 0x2e, 0xae, 0x2e, 0xde, 0x59, 0x3b, 0x64, 0x00, 0xbd, 0xc5, 0xf4, 0x82, 0x4e,
-	0x97, 0xe7, 0xef, 0x7f, 0xb1, 0x34, 0xe7, 0x02, 0x4c, 0x8a, 0x51, 0xcc, 0x71, 0x1e, 0xa2, 0x8f,
-	0xe4, 0x29, 0xf4, 0x92, 0xe2, 0xc3, 0x65, 0x79, 0x24, 0x9a, 0xd6, 0x69, 0x57, 0x38, 0xae, 0xf3,
-	0xa8, 0x18, 0x1f, 0x8b, 0x03, 0x74, 0xc3, 0x40, 0xd4, 0xde, 0xa3, 0x46, 0x61, 0xce, 0x02, 0xe7,
-	0x77, 0x0d, 0x06, 0x32, 0xcb, 0x02, 0x57, 0x11, 0x32, 0x4e, 0xce, 0x00, 0xd2, 0x6a, 0x1d, 0x44,
-	0x22, 0x73, 0xf2, 0xf4, 0x81, 0x5d, 0xa1, 0x0d, 0x38, 0x79, 0x02, 0xf2, 0xcd, 0xfa, 0xa1, 0x8e,
-	0xb0, 0x67, 0x01, 0x39, 0x83, 0x41, 0x2a, 0x1e, 0x72, 0x85, 0x27, 0xb3, 0xf5, 0x63, 0xfd, 0xc4,
-	0x9c, 0x1c, 0xb5, 0x52, 0x57, 0xed, 0xd0, 0x7e, 0x5a, 0x1b, 0x19, 0x79, 0x06, 0x66, 0x84, 0xe9,
-	0xc7, 0x0d, 0xba, 0x69, 0x1c, 0x73, 0xb1, 0x4a, 0x7d, 0x0a, 0xd2, 0x45, 0xe3, 0x98, 0x3b, 0x7f,
-	0xee, 0x42, 0x67, 0x2e, 0x13, 0x91, 0xd3, 0xd6, 0xe4, 0x9b, 0xb5, 0x2b, 0xc4, 0xf8, 0xd2, 0xe3,
-	0x5e, 0x63, 0xd4, 0x5f, 0xc0, 0x30, 0x64, 0x9b, 0x90, 0xa1, 0x9b, 0x49, 0x11, 0xd4, 0x98, 0x06,
-	0xd2, 0x5b, 0x2a, 0xf3, 0x2d, 0x18, 0xb2, 0x28, 0xf1, 0xbe, 0x39, 0xb1, 0xef, 0x95, 0xae, 0x90,
-	0x54, 0xe1, 0x08, 0x81, 0xbd, 0x2c, 0xfc, 0x0d, 0xd5, 0x3a, 0x8b, 0x6f, 0xf2, 0x33, 0x0c, 0xfc,
-	0x14, 0x3d, 0xb1, 0x4b, 0x81, 0xc7, 0xd1, 0x36, 0x44, 0xb2, 0xd1, 0x58, 0xde, 0xf4, 0xb8, 0xbc,
-	0xe9, 0xf1, 0xb2, 0xbc, 0x69, 0xda, 0x2f, 0x09, 0x97, 0x1e, 0x47, 0x72, 0x01, 0x07, 0xf8, 0x6b,
-	0x12, 0xa6, 0x8d, 0x14, 0x9d, 0xff, 0x4d, 0x31, 0xac, 0x29, 0x22, 0xc9, 0x08, 0xba, 0x11, 0x72,
-	0x2f, 0xf0, 0xb8, 0x67, 0x77, 0x45, 0xb3, 0x95, 0xed, 0x38, 0xd0, 0x2d, 0x05, 0x2a, 0xf6, 0x6f,
-	0x76, 0xfd, 0x76, 0x76, 0x3d, 0xb5, 0x76, 0x8a, 0x6f, 0x3a, 0x7d, 0xf7, 0x7e, 0x39, 0xb5, 0x34,
-	0xe7, 0x03, 0xc0, 0x3c, 0xe7, 0x14, 0x6f, 0x73, 0xcc, 0x78, 0xd1, 0x67, 0xe2, 0xf1, 0xb5, 0x50,
-	0xbc, 0x4f, 0xc5, 0x37, 0xf9, 0x06, 0x3a, 0x4a, 0x1e, 0xb1, 0x09, 0xe6, 0x84, 0xdc, 0x1f, 0x04,
-	0x2d, 0x21, 0xe4, 0x08, 0x8c, 0xd7, 0xf3, 0xd9, 0x1b, 0xdc, 0x2a, 0xe9, 0x95, 0xe5, 0xbc, 0x02,
-	0xb8, 0xc2, 0x07, 0xdf, 0xa9, 0x99, 0xbb, 0x2d, 0xe6, 0x0a, 0xcc, 0xb7, 0x61, 0x56, 0x51, 0x9f,
-	0xc3, 0xa3, 0xea, 0x14, 0x0b, 0x9e, 0xb8, 0x63, 0x99, 0xe7, 0xa0, 0x0c, 0xcc, 0x3d, 0xbe, 0x2e,
-	0x0e, 0xf8, 0x10, 0xf6, 0x37, 0x61, 0x14, 0x72, 0xf5, 0x57, 0x27, 0x8d, 0xff, 0x2c, 0x71, 0x00,
-	0xa6, 0x90, 0x22, 0x4b, 0x62, 0x96, 0xa1, 0xf3, 0x15, 0x98, 0xa2, 0x62, 0x69, 0x12, 0xbb, 0x96,
-	0x41, 0xbe, 0x56, 0x9a, 0xce, 0x39, 0xf4, 0x65, 0x81, 0x0a, 0x79, 0x08, 0xfb, 0x45, 0x61, 0x99,
-	0xad, 0x1d, 0xeb, 0x27, 0x7d, 0x2a, 0x0d, 0xf2, 0x39, 0xf4, 0x78, 0x9a, 0x33, 0xdf, 0xe3, 0x28,
-	0x4f, 0xaa, 0x4b, 0x6b, 0x87, 0x73, 0x06, 0x83, 0x4b, 0xdc, 0x20, 0xc7, 0x4f, 0x51, 0xc8, 0x82,
-	0x61, 0x49, 0x96, 0x25, 0x4c, 0xfe, 0xd2, 0xa0, 0xa7, 0x46, 0x73, 0x79, 0x4e, 0x5e, 0x82, 0x3e,
-	0xcf, 0x39, 0xf9, 0xac, 0x39, 0xb7, 0x6a, 0xe6, 0xa3, 0xa3, 0xbb, 0x6e, 0xd5, 0xc6, 0x4b, 0xd0,
-	0xaf, 0xb0, 0xcd, 0xaa, 0x27, 0xd8, 0x62, 0x35, 0x65, 0xfa, 0x1e, 0xf6, 0x0a, 0x31, 0x48, 0x33,
-	0xde, 0x18, 0xdf, 0xe8, 0xf1, 0x3d, 0xbf, 0x22, 0xfe, 0x08, 0x86, 0x6c, 0x82, 0x34, 0xcf, 0xb1,
-	0x25, 0xca, 0xe8, 0xc9, 0xbf, 0x44, 0x24, 0xfd, 0xc6, 0x10, 0xb7, 0xf2, 0xdd, 0x3f, 0x01, 0x00,
-	0x00, 0xff, 0xff, 0x56, 0x72, 0xae, 0x33, 0x6e, 0x07, 0x00, 0x00,
+var fileDescriptor0 = []byte{
+	// 848 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x5f, 0x8b, 0xdb, 0x46,
+	0x10, 0x3f, 0x9d, 0xef, 0x6c, 0xdf, 0xc8, 0xf6, 0xe9, 0x16, 0xe7, 0xa2, 0xba, 0x85, 0x1e, 0x82,
+	0xd0, 0x4b, 0x0f, 0x5c, 0x70, 0x29, 0xa4, 0x09, 0xa5, 0x24, 0x77, 0xe6, 0x30, 0x49, 0x1c, 0xb3,
+	0xf6, 0x43, 0xdf, 0xc4, 0x46, 0x9a, 0xda, 0x22, 0xd6, 0x4a, 0x27, 0x8d, 0xa0, 0xee, 0xd7, 0xeb,
+	0x77, 0xe9, 0x43, 0xfb, 0xd6, 0x4f, 0x50, 0xb4, 0xab, 0x7f, 0x76, 0x48, 0x0b, 0x79, 0xb2, 0x66,
+	0xe6, 0xf7, 0x9b, 0x9d, 0xf9, 0xcd, 0x8c, 0x61, 0x20, 0x91, 0x52, 0x12, 0x84, 0xe3, 0x38, 0x89,
+	0x28, 0x62, 0xdd, 0xd2, 0x1e, 0x9d, 0x53, 0x10, 0x62, 0x4a, 0x22, 0x8c, 0x75, 0xc8, 0xf9, 0xcb,
+	0x00, 0x8b, 0xa3, 0x9f, 0x49, 0x5f, 0x48, 0x6f, 0xb7, 0xf4, 0x36, 0x18, 0x22, 0xfb, 0x11, 0x4e,
+	0x68, 0x17, 0xa3, 0x6d, 0x5c, 0x19, 0xd7, 0x83, 0xc9, 0x93, 0x71, 0x95, 0xee, 0x10, 0x39, 0xd6,
+	0x3f, 0xab, 0x5d, 0x8c, 0x5c, 0x51, 0xd8, 0x63, 0xe8, 0x84, 0x81, 0x74, 0x13, 0x7c, 0xb0, 0x8f,
+	0xaf, 0x8c, 0xeb, 0x16, 0x6f, 0x87, 0x81, 0xe4, 0xf8, 0xc0, 0x86, 0x70, 0x4a, 0x11, 0x89, 0xad,
+	0xdd, 0x52, 0x6e, 0x6d, 0xb0, 0xa7, 0x60, 0x25, 0x18, 0x8b, 0x20, 0x71, 0x69, 0x93, 0x60, 0xba,
+	0x89, 0xb6, 0xbe, 0x7d, 0xa2, 0x00, 0xe7, 0xda, 0xbf, 0x2a, 0xdd, 0xec, 0x06, 0x2e, 0xd2, 0xcc,
+	0xf3, 0x30, 0x4d, 0x1b, 0xd8, 0x53, 0x85, 0xb5, 0x8a, 0x40, 0x05, 0x76, 0x86, 0x00, 0x75, 0x69,
+	0xac, 0x0d, 0xc7, 0x7c, 0x69, 0x1d, 0x39, 0xff, 0x18, 0x60, 0x4d, 0xa5, 0x97, 0xec, 0x62, 0x0a,
+	0x22, 0x59, 0x34, 0xfb, 0xd3, 0x5e, 0xb3, 0x4f, 0xeb, 0x66, 0x0f, 0x91, 0x0d, 0x47, 0xa3, 0xe1,
+	0x67, 0x60, 0xa3, 0xf6, 0xa3, 0xef, 0x62, 0x85, 0x70, 0x3f, 0xe0, 0x4e, 0x29, 0xd0, 0xe3, 0x97,
+	0x55, 0xbc, 0x4e, 0xf0, 0x1a, 0x77, 0xfb, 0xcc, 0x94, 0x44, 0x42, 0x81, 0x5c, 0xbb, 0x32, 0x92,
+	0x1e, 0x2a, 0x91, 0x9a, 0xcc, 0x65, 0x11, 0x9e, 0xe7, 0x51, 0xe7, 0x06, 0x06, 0xfb, 0xb5, 0x30,
+	0x80, 0xf6, 0xcb, 0xe9, 0xf2, 0xfe, 0xf6, 0xad, 0x75, 0xc4, 0xfa, 0x70, 0xb6, 0x9c, 0xde, 0xf2,
+	0xe9, 0xea, 0xd5, 0xbb, 0x5f, 0x2c, 0xc3, 0xb9, 0x05, 0x93, 0x63, 0x18, 0x11, 0x2e, 0x02, 0xf4,
+	0x90, 0x7d, 0x09, 0x67, 0x71, 0xfe, 0xe1, 0xca, 0x2c, 0x54, 0x3d, 0xb7, 0x78, 0x57, 0x39, 0xe6,
+	0x59, 0x98, 0x4f, 0x4f, 0x46, 0x3e, 0xba, 0x81, 0xaf, 0x6a, 0x3f, 0xe3, 0xed, 0xdc, 0x9c, 0xf9,
+	0xce, 0x1f, 0x06, 0xf4, 0x75, 0x96, 0x25, 0xae, 0x43, 0x94, 0xc4, 0x9e, 0x03, 0x24, 0xd5, 0x36,
+	0xa8, 0x44, 0xe6, 0x64, 0xf4, 0xe9, 0x4d, 0xe1, 0x0d, 0x34, 0xfb, 0x02, 0xf4, 0x93, 0xf5, 0x3b,
+	0x1d, 0x65, 0xcf, 0x7c, 0xf6, 0x1c, 0xfa, 0x89, 0x7a, 0xc7, 0x55, 0x9e, 0xd4, 0x6e, 0x5d, 0xb5,
+	0xae, 0xcd, 0xc9, 0xa3, 0x66, 0xe6, 0xaa, 0x19, 0xde, 0x4b, 0x6a, 0x23, 0x65, 0x5f, 0x83, 0x19,
+	0x62, 0xf2, 0x61, 0x8b, 0x6e, 0x12, 0x45, 0xa4, 0xf6, 0xa8, 0xc7, 0x41, 0xbb, 0x78, 0x14, 0x91,
+	0xf3, 0xf7, 0x31, 0x74, 0x16, 0x51, 0x20, 0x09, 0x13, 0x36, 0xde, 0x1b, 0x7b, 0xa3, 0xf2, 0x02,
+	0x30, 0xbe, 0x13, 0x24, 0x1a, 0x73, 0x7e, 0x02, 0x83, 0x40, 0x6e, 0x03, 0x89, 0x6e, 0xaa, 0x15,
+	0x28, 0x66, 0xd4, 0xd7, 0xde, 0x52, 0x96, 0xef, 0xa0, 0xad, 0x6b, 0x52, 0xcf, 0x9b, 0x93, 0xc7,
+	0x87, 0x85, 0x17, 0x40, 0x5e, 0xc0, 0x18, 0x83, 0x93, 0x34, 0xf8, 0x1d, 0x8b, 0x4d, 0x56, 0xdf,
+	0xec, 0x67, 0xe8, 0x7b, 0x09, 0x0a, 0xb5, 0x47, 0xbe, 0x20, 0xb4, 0xdb, 0x85, 0xbc, 0xeb, 0x28,
+	0x5a, 0x6f, 0x8b, 0xab, 0x7e, 0x9f, 0xfd, 0x3a, 0x5e, 0x95, 0xd7, 0xcc, 0x7b, 0x25, 0xe1, 0x4e,
+	0x10, 0xb2, 0x5b, 0x38, 0xc7, 0xdf, 0xe2, 0x20, 0x69, 0xa4, 0xe8, 0xfc, 0x6f, 0x8a, 0x41, 0x4d,
+	0x51, 0x49, 0x46, 0xd0, 0x0d, 0x91, 0x84, 0x2f, 0x48, 0xd8, 0x5d, 0xd5, 0x6b, 0x65, 0x3b, 0x0e,
+	0x74, 0x4b, 0x7d, 0xf2, 0xdd, 0x9b, 0xcd, 0xdf, 0xcc, 0xe6, 0x53, 0xeb, 0x28, 0xff, 0xe6, 0xd3,
+	0xb7, 0xef, 0x56, 0x53, 0xcb, 0x70, 0x10, 0x60, 0x91, 0x11, 0xc7, 0x87, 0x0c, 0x53, 0xca, 0xfb,
+	0x8c, 0x05, 0x6d, 0x94, 0xde, 0x3d, 0xae, 0xbe, 0xd9, 0x0d, 0x74, 0x62, 0xad, 0xb6, 0x5a, 0x03,
+	0x73, 0x72, 0xf1, 0xd1, 0x18, 0x78, 0x89, 0x60, 0x97, 0xd0, 0x7e, 0xb9, 0x98, 0xbd, 0xc6, 0x5d,
+	0x21, 0x7c, 0x61, 0x39, 0xcf, 0x00, 0xee, 0xf1, 0x3f, 0x9f, 0xa9, 0x99, 0xc7, 0x7b, 0xcc, 0x35,
+	0x98, 0x6f, 0x82, 0xb4, 0xa2, 0x7e, 0x0b, 0x17, 0xd5, 0x15, 0xe6, 0x3c, 0x75, 0xc2, 0x3a, 0xcf,
+	0x79, 0x19, 0x58, 0x08, 0xda, 0xe4, 0xb7, 0x3b, 0x84, 0xd3, 0x6d, 0x10, 0x06, 0x54, 0xfc, 0xc9,
+	0x69, 0xe3, 0x93, 0x25, 0xf6, 0xc1, 0x54, 0x4a, 0xa4, 0x71, 0x24, 0x53, 0x74, 0xbe, 0x01, 0x53,
+	0x55, 0xac, 0x4d, 0x66, 0xd7, 0x2a, 0xe8, 0xd7, 0x4a, 0xd3, 0x79, 0x05, 0x3d, 0x5d, 0x60, 0x81,
+	0x1c, 0xc2, 0x69, 0x5e, 0x58, 0x6a, 0x1b, 0x57, 0xad, 0xeb, 0x1e, 0xd7, 0x06, 0xfb, 0x0a, 0xce,
+	0x28, 0xc9, 0xa4, 0x27, 0x08, 0xf5, 0x39, 0x75, 0x79, 0xed, 0x70, 0x5e, 0x40, 0xff, 0x0e, 0xb7,
+	0x48, 0xf8, 0x39, 0x0a, 0x59, 0x30, 0x28, 0xc9, 0xba, 0x84, 0xc9, 0x9f, 0x06, 0x74, 0xe7, 0x48,
+	0xcb, 0x7c, 0x46, 0x6c, 0x02, 0xad, 0x45, 0x46, 0x6c, 0xd8, 0x98, 0x5a, 0x35, 0xf0, 0xd1, 0xa3,
+	0x03, 0x6f, 0xd1, 0xc3, 0x04, 0x5a, 0xf7, 0xb8, 0xc7, 0xa9, 0xa7, 0xd7, 0xe4, 0x34, 0x15, 0xfa,
+	0x01, 0x4e, 0x72, 0x1d, 0x58, 0x23, 0xdc, 0x18, 0xdc, 0xe8, 0xf2, 0xd0, 0x5d, 0xd0, 0x5e, 0x40,
+	0x5b, 0x57, 0xcf, 0x1a, 0x57, 0xb8, 0x27, 0xc6, 0xc8, 0xfe, 0x38, 0xa0, 0xc9, 0xef, 0xdb, 0xea,
+	0x42, 0xbe, 0xff, 0x37, 0x00, 0x00, 0xff, 0xff, 0x3a, 0xbb, 0x3a, 0x6c, 0x4c, 0x07, 0x00, 0x00,
 }