Add Reframe provider to Hydra

go.mod

@@ -19,7 +19,7 @@ require (
 	github.com/hnlq715/golang-lru v0.2.1-0.20200422024707-82ba7badf9a6
 	github.com/ipfs/go-cid v0.0.7
 	github.com/ipfs/go-datastore v0.5.1
-	github.com/ipfs/go-delegated-routing v0.1.3
+	github.com/ipfs/go-delegated-routing v0.1.4-0.20220504205146-3325fa287956
 	github.com/ipfs/go-ds-dynamodb v0.1.0
 	github.com/ipfs/go-ds-leveldb v0.5.0
 	github.com/ipfs/go-ipfs-util v0.0.2
@@ -36,11 +36,12 @@ require (
 	github.com/libp2p/go-libp2p-peerstore v0.6.0
 	github.com/libp2p/go-libp2p-quic-transport v0.15.2
 	github.com/libp2p/go-libp2p-record v0.1.3
+	github.com/libp2p/go-libp2p-routing v0.1.0
 	github.com/libp2p/go-libp2p-tls v0.3.1
 	github.com/libp2p/go-tcp-transport v0.4.0
-	github.com/multiformats/go-multiaddr v0.4.0
+	github.com/multiformats/go-multiaddr v0.5.0
 	github.com/multiformats/go-multicodec v0.4.0
-	github.com/multiformats/go-multihash v0.0.15
+	github.com/multiformats/go-multihash v0.1.0
 	github.com/multiformats/go-varint v0.0.6
 	github.com/ncabatoff/process-exporter v0.7.10
 	github.com/prometheus/client_golang v1.11.0
@@ -51,6 +52,7 @@ require (
 	github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee
 	go.opencensus.io v0.23.0
 	golang.org/x/crypto v0.0.0-20210813211128-0a44fdfbc16e
+	google.golang.org/appengine v1.6.6
 )
 
 go 1.16

go.sum

@@ -230,6 +230,8 @@ github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVB
 github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
 github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
+github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og=
+github.com/frankban/quicktest v1.14.2/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
@@ -320,6 +322,8 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -430,6 +434,8 @@ github.com/ipfs/go-datastore v0.5.1 h1:WkRhLuISI+XPD0uk3OskB0fYFSyqK8Ob5ZYew9Qa1
 github.com/ipfs/go-datastore v0.5.1/go.mod h1:9zhEApYMTl17C8YDp7JmU7sQZi2/wqiYh73hakZ90Bk=
 github.com/ipfs/go-delegated-routing v0.1.3 h1:FmDnXUIpbBM9+NDG7Nd03FudzM5w/Pw26QVnHMvXQQE=
 github.com/ipfs/go-delegated-routing v0.1.3/go.mod h1:+GIZWov5Faf1nS1nDodnoMK9FrBeA2QVFuKYj5ZGKJQ=
+github.com/ipfs/go-delegated-routing v0.1.4-0.20220504205146-3325fa287956 h1:dFTJsB2aG0c+FtnJU/6bU4C0hYB3KVX+jylb93tfM/U=
+github.com/ipfs/go-delegated-routing v0.1.4-0.20220504205146-3325fa287956/go.mod h1:9JG6OTYz9aXkItgvXYsDiBxKrC69TOh5VMk5zFvm0I8=
 github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk=
 github.com/ipfs/go-detect-race v0.0.1/go.mod h1:8BNT7shDZPo99Q74BpGMK+4D8Mn4j46UU0LZ723meps=
 github.com/ipfs/go-ds-badger v0.0.2/go.mod h1:Y3QpeSFWQf6MopLTiZD+VT6IC1yZqaGmjvRcKeSGij8=
@@ -471,9 +477,14 @@ github.com/ipfs/go-log/v2 v2.5.0 h1:+MhAooFd9XZNvR0i9FriKW6HB0ql7HNXUuflWtc0dd4=
 github.com/ipfs/go-log/v2 v2.5.0/go.mod h1:prSpmC1Gpllc9UYWxDiZDreBYw7zp4Iqp1kOLU9U5UI=
 github.com/ipfs/ipfs-ds-postgres v0.2.0 h1:u9Y/FYbGQBE/DopRU2DtkeZSk2rw1ydJsW9A5alDPBw=
 github.com/ipfs/ipfs-ds-postgres v0.2.0/go.mod h1:eiBHRZ+BporvENFnFk3BIOV5swBa3HqKSHyxCalVOvo=
+github.com/ipld/edelweiss v0.1.0 h1:hejNh2p+XH/yVO49exRfvP4KmENQGDPybCmFt9Ylbg4=
+github.com/ipld/edelweiss v0.1.0/go.mod h1:14NnBVHgrPO8cqDnKg7vc69LGI0aCAcax6mj21+99ec=
 github.com/ipld/go-ipld-prime v0.9.0/go.mod h1:KvBLMr4PX1gWptgkzRjVZCrLmSGcZCb/jioOQwCqZN8=
 github.com/ipld/go-ipld-prime v0.12.3 h1:furVobw7UBLQZwlEwfE26tYORy3PAK8VYSgZOSr3JMQ=
 github.com/ipld/go-ipld-prime v0.12.3/go.mod h1:PaeLYq8k6dJLmDUSLrzkEpoGV4PEfe/1OtFN/eALOc8=
+github.com/ipld/go-ipld-prime v0.14.4-0.20211217152141-008fd70fc96f/go.mod h1:QcE4Y9n/ZZr8Ijg5bGPT0GqYWgZ1704nH0RDcQtgTP0=
+github.com/ipld/go-ipld-prime v0.16.0 h1:RS5hhjB/mcpeEPJvfyj0qbOj/QL+/j05heZ0qa97dVo=
+github.com/ipld/go-ipld-prime v0.16.0/go.mod h1:axSCuOCBPqrH+gvXr2w9uAOulJqBPhHPT2PjoiiU1qA=
 github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
@@ -744,6 +755,8 @@ github.com/libp2p/go-libp2p-quic-transport v0.15.2/go.mod h1:wv4uGwjcqe8Mhjj7N/I
 github.com/libp2p/go-libp2p-record v0.1.2/go.mod h1:pal0eNcT5nqZaTV7UGhqeGqxFgGdsU/9W//C8dqjQDk=
 github.com/libp2p/go-libp2p-record v0.1.3 h1:R27hoScIhQf/A8XJZ8lYpnqh9LatJ5YbHs28kCIfql0=
 github.com/libp2p/go-libp2p-record v0.1.3/go.mod h1:yNUff/adKIfPnYQXgp6FQmNu3gLJ6EMg7+/vv2+9pY4=
+github.com/libp2p/go-libp2p-routing v0.1.0 h1:hFnj3WR3E2tOcKaGpyzfP4gvFZ3t8JkQmbapN0Ct+oU=
+github.com/libp2p/go-libp2p-routing v0.1.0/go.mod h1:zfLhI1RI8RLEzmEaaPwzonRvXeeSHddONWkcTcB54nE=
 github.com/libp2p/go-libp2p-routing-helpers v0.2.3/go.mod h1:795bh+9YeoFl99rMASoiVgHdi5bjack0N1+AFAdbvBw=
 github.com/libp2p/go-libp2p-secio v0.1.0/go.mod h1:tMJo2w7h3+wN4pgU2LSYeiKPrfqBgkOsdiKK77hE7c8=
 github.com/libp2p/go-libp2p-secio v0.2.0/go.mod h1:2JdZepB8J5V9mBp79BmwsaPQhRPNN2NrnB2lKQcdy6g=
@@ -991,6 +1004,8 @@ github.com/multiformats/go-multiaddr v0.3.1/go.mod h1:uPbspcUPd5AfaP6ql3ujFY+QWz
 github.com/multiformats/go-multiaddr v0.3.3/go.mod h1:lCKNGP1EQ1eZ35Za2wlqnabm9xQkib3fyB+nZXHLag0=
 github.com/multiformats/go-multiaddr v0.4.0 h1:hL/K4ZJhJ5PTw3nwylq9lGU5yArzcAroZmex1ghSEkQ=
 github.com/multiformats/go-multiaddr v0.4.0/go.mod h1:YcpyLH8ZPudLxQlemYBPhSm0/oCXAT8Z4mzFpyoPyRc=
+github.com/multiformats/go-multiaddr v0.5.0 h1:i/JuOoVg4szYQ4YEzDGtb2h0o8M7CG/Yq6cGlcjWZpM=
+github.com/multiformats/go-multiaddr v0.5.0/go.mod h1:3KAxNkUqLTJ20AAwN4XVX4kZar+bR+gh4zgbfr3SNug=
 github.com/multiformats/go-multiaddr-dns v0.0.1/go.mod h1:9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q=
 github.com/multiformats/go-multiaddr-dns v0.0.2/go.mod h1:9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q=
 github.com/multiformats/go-multiaddr-dns v0.2.0/go.mod h1:TJ5pr5bBO7Y1B18djPuRsVkduhQH2YqYSbxWJzYGdK0=
@@ -1023,6 +1038,8 @@ github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUj
 github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
 github.com/multiformats/go-multihash v0.0.15 h1:hWOPdrNqDjwHDx82vsYGSDZNyktOJJ2dzZJzFkOV1jM=
 github.com/multiformats/go-multihash v0.0.15/go.mod h1:D6aZrWNLFTV/ynMpKsNtB40mJzmCl4jb1alC0OvHiHg=
+github.com/multiformats/go-multihash v0.1.0 h1:CgAgwqk3//SVEw3T+6DqI4mWMyRuDwZtOWcJT0q9+EA=
+github.com/multiformats/go-multihash v0.1.0/go.mod h1:RJlXsxt6vHGaia+S8We0ErjhojtKzPP2AH4+kYM7k84=
 github.com/multiformats/go-multistream v0.1.0/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
 github.com/multiformats/go-multistream v0.1.1/go.mod h1:KmHZ40hzVxiaiwlj3MEbYgK9JFk2/9UktWZAF54Du38=
 github.com/multiformats/go-multistream v0.2.1/go.mod h1:5GZPQZbkWOLOn3J2y4Y99vVW7vOfsAflxARk3x14o6k=
@@ -1220,6 +1237,7 @@ github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a/go.mod h1:7A
 github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 h1:RC6RW7j+1+HkWaX/Yh71Ee5ZHaHYt7ZP4sQgUrm6cDU=
 github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod h1:w0SWMsp6j9O/dk4/ZpIhL+3CkG8ofA2vuv7k+ltqUMc=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
@@ -1670,6 +1688,7 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@@ -1788,6 +1807,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+lukechampine.com/blake3 v1.1.6 h1:H3cROdztr7RCfoaTpGZFQsrqvweFLrqS73j7L7cmR5c=
+lukechampine.com/blake3 v1.1.6/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

head/head.go

@@ -140,33 +140,33 @@ func NewHead(ctx context.Context, options ...opts.Option) (*Head, chan Bootstrap
 	}
 
 	var cachingProviderStore *hproviders.CachingProviderStore
-	if cfg.ProvidersFinder != nil && cfg.StoreTheIndexAddr == "" {
+	if cfg.ProvidersFinder != nil && cfg.ReframeAddr == "" {
 		providerStore = hproviders.NewCachingProviderStore(providerStore, providerStore, cfg.ProvidersFinder, nil)
 	}
-	if cfg.ProvidersFinder != nil && cfg.StoreTheIndexAddr != "" {
-		stiProviderStore, err := hproviders.NewStoreTheIndexProviderStore(cfg.DelegateHTTPClient, cfg.StoreTheIndexAddr)
+	if cfg.ProvidersFinder != nil && cfg.ReframeAddr != "" {
+		reframeProviderStore, err := hproviders.NewReframeProviderStore(cfg.DelegateHTTPClient, cfg.ReframeAddr)
 		if err != nil {
-			return nil, nil, fmt.Errorf("creating StoreTheIndex providerstore: %w", err)
+			return nil, nil, fmt.Errorf("creating Reframe providerstore: %w", err)
 		}
 
 		cachingProviderStore = hproviders.NewCachingProviderStore(
-			hproviders.CombineProviders(providerStore, stiProviderStore),
+			hproviders.CombineProviders(providerStore, reframeProviderStore),
 			providerStore,
 			cfg.ProvidersFinder,
 			nil,
 		)
 
 		// we still want to use the caching provider store instead of the provider store directly b/c it publishes cache metrics
-		fmt.Printf("Will delegate to %v with timeout %v.\n", cfg.StoreTheIndexAddr, cfg.DelegateHTTPClient.Timeout)
+		fmt.Printf("Will delegate to %v with timeout %v.\n", cfg.ReframeAddr, cfg.DelegateHTTPClient.Timeout)
 		providerStore = cachingProviderStore
 	}
-	if cfg.ProvidersFinder == nil && cfg.StoreTheIndexAddr != "" {
-		stiPS, err := hproviders.NewStoreTheIndexProviderStore(cfg.DelegateHTTPClient, cfg.StoreTheIndexAddr)
+	if cfg.ProvidersFinder == nil && cfg.ReframeAddr != "" {
+		reframePS, err := hproviders.NewReframeProviderStore(cfg.DelegateHTTPClient, cfg.ReframeAddr)
 		if err != nil {
-			return nil, nil, fmt.Errorf("creating StoreTheIndex provider store: %w", err)
+			return nil, nil, fmt.Errorf("creating Reframe provider store: %w", err)
 		}
-		fmt.Printf("Will delegate to %v with timeout %v.\n", cfg.StoreTheIndexAddr, cfg.DelegateHTTPClient.Timeout)
-		providerStore = stiPS
+		fmt.Printf("Will delegate to %v with timeout %v.\n", cfg.ReframeAddr, cfg.DelegateHTTPClient.Timeout)
+		providerStore = reframePS
 	}
 
 	dhtOpts = append(dhtOpts, dht.ProviderStore(providerStore))

head/opts/options.go

@@ -24,7 +24,7 @@ type Options struct {
 	Datastore            ds.Batching
 	Peerstore            peerstore.Peerstore
 	ProviderStoreBuilder ProviderStoreBuilderFunc
-	StoreTheIndexAddr    string
+	ReframeAddr          string
 	DelegateHTTPClient   *http.Client
 	RoutingTable         *kbucket.RoutingTable
 	EnableRelay          bool
@@ -99,11 +99,11 @@ func DelegateHTTPClient(c *http.Client) Option {
 	}
 }
 
-// StoreTheIndexAddr configures the Hydra Head to delegate routing also to this storetheindex addr.
+// ReframeAddr configures the Hydra Head to delegate routing also to this storetheindex addr.
 // Defaults to empty string which indicates no delegation.
-func StoreTheIndexAddr(addr string) Option {
+func ReframeAddr(addr string) Option {
 	return func(o *Options) error {
-		o.StoreTheIndexAddr = addr
+		o.ReframeAddr = addr
 		return nil
 	}
 }

hydra/hydra.go

@@ -65,7 +65,7 @@ type Options struct {
 	PeerstorePath     string
 	ProviderStore     string
 	DelegateTimeout   time.Duration
-	StoreTheIndexAddr string
+	ReframeAddr       string
 	GetPort           func() int
 	NHeads            int
 	ProtocolPrefix    protocol.ID
@@ -168,7 +168,7 @@ func NewHydra(ctx context.Context, options Options) (*Hydra, error) {
 			opts.ID(priv),
 			opts.BootstrapPeers(options.BootstrapPeers),
 			opts.DelegateHTTPClient(delegateHTTPClient),
-			opts.StoreTheIndexAddr(options.StoreTheIndexAddr),
+			opts.ReframeAddr(options.ReframeAddr),
 		}
 		if options.EnableRelay {
 			hdOpts = append(hdOpts, opts.EnableRelay())

main.go

@@ -43,7 +43,7 @@ func main() {
 	providerStore := flag.String("provider-store", "", "A non-default provider store to use, \"dynamodb://table=<string>,ttl=<ttl-in-seconds>,queryLimit=<int>\"")
 	httpAPIAddr := flag.String("httpapi-addr", defaultHTTPAPIAddr, "Specify an IP and port to run the HTTP API server on")
 	delegateTimeout := flag.Int("delegate-timeout", 0, "Timeout for delegated routing in milliseconds")
-	stiAddr := flag.String("store-the-index-addr", "", "StoreTheIndex API endpoint for delegated routing")
+	reframeAddr := flag.String("reframe-addr", "", "Reframe API endpoint for delegated routing")
 	inmem := flag.Bool("mem", false, "Use an in-memory database. This overrides the -db option")
 	metricsAddr := flag.String("metrics-addr", defaultMetricsAddr, "Specify an IP and port to run Prometheus metrics and pprof HTTP server on")
 	enableRelay := flag.Bool("enable-relay", false, "Enable libp2p circuit relaying for this node (default false).")
@@ -116,8 +116,8 @@ func main() {
 	if *delegateTimeout == 0 {
 		*delegateTimeout = mustGetEnvInt("HYDRA_DELEGATED_ROUTING_TIMEOUT", 1000)
 	}
-	if *stiAddr == "" {
-		*stiAddr = os.Getenv("HYDRA_STORE_THE_INDEX_ADDR")
+	if *reframeAddr == "" {
+		*reframeAddr = os.Getenv("HYDRA_REFRAME_ADDR")
 	}
 
 	// Allow short keys. Otherwise, we'll refuse connections from the bootsrappers and break the network.
@@ -161,7 +161,7 @@ func main() {
 		PeerstorePath:     *pstorePath,
 		ProviderStore:     *providerStore,
 		DelegateTimeout:   time.Millisecond * time.Duration(*delegateTimeout),
-		StoreTheIndexAddr: *stiAddr,
+		ReframeAddr:       *reframeAddr,
 		EnableRelay:       *enableRelay,
 		ProtocolPrefix:    protocol.ID(*protocolPrefix),
 		BucketSize:        *bucketSize,

providers/reframe.go

@@ -0,0 +1,40 @@
+package providers
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"github.com/ipfs/go-cid"
+	"github.com/ipfs/go-delegated-routing/client"
+	"github.com/ipfs/go-delegated-routing/gen/proto"
+	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/multiformats/go-multihash"
+)
+
+func NewReframeProviderStore(httpClient *http.Client, endpointURL string) (*reframeProvider, error) {
+	q, err := proto.New_DelegatedRouting_Client(endpointURL, proto.DelegatedRouting_Client_WithHTTPClient(httpClient))
+	if err != nil {
+		return nil, err
+	}
+	return &reframeProvider{
+		reframe: client.NewClient(q),
+	}, nil
+}
+
+type reframeProvider struct {
+	reframe *client.Client
+}
+
+func (x *reframeProvider) AddProvider(ctx context.Context, key []byte, prov peer.AddrInfo) error {
+	return fmt.Errorf("reframe does not support adding providers")
+}
+
+func (x *reframeProvider) GetProviders(ctx context.Context, key []byte) ([]peer.AddrInfo, error) {
+	mh, err := multihash.Cast(key)
+	if err != nil {
+		return nil, err
+	}
+	cid1 := cid.NewCidV1(cid.Raw, mh)
+	return x.reframe.FindProviders(ctx, cid1)
+}

testing/delegated_test.go

@@ -19,17 +19,17 @@ import (
 	"github.com/libp2p/go-tcp-transport"
 	"github.com/libp2p/hydra-booster/head"
 	"github.com/libp2p/hydra-booster/head/opts"
-	"github.com/libp2p/hydra-booster/providers/storetheindex"
+	"github.com/libp2p/hydra-booster/testing/reframe"
 	"github.com/multiformats/go-multiaddr"
 	"github.com/stretchr/testify/require"
 )
 
 func TestDelegatedRoutingEndToEnd(t *testing.T) {
 	key := cid.NewCidV0(ipfsutil.Hash([]byte("testkey")))
 	fmt.Printf("cid: %s\n", key.String())
-	// start mock delegated routing server
 
-	mockServer := storetheindex.NewMockServer(map[cid.Cid][]peer.AddrInfo{
+	// start mock delegated routing server
+	mockServer := reframe.NewMockServer(map[cid.Cid][]peer.AddrInfo{
 		key: {testAddrInfo},
 	})
 	s := httptest.NewServer(mockServer)
@@ -40,7 +40,7 @@ func TestDelegatedRoutingEndToEnd(t *testing.T) {
 	head, err := head.SpawnTestHead(
 		context.Background(),
 		opts.Addrs([]multiaddr.Multiaddr{headTcpAddr}),
-		opts.StoreTheIndexAddr(s.URL),
+		opts.ReframeAddr(s.URL),
 		opts.DelegateHTTPClient(&http.Client{Timeout: 1 * time.Second}),
 	)
 	if err != nil {

testing/mock-routing-server/main.go

@@ -4,14 +4,12 @@ import (
 	"flag"
 	"net/http"
 
-	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-delegated-routing/client"
 	"github.com/ipfs/go-delegated-routing/server"
 	logging "github.com/ipfs/go-log"
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/hydra-booster/testing/reframe"
 )
 
-var log = logging.Logger("hydra/test-routing-server")
+var log = logging.Logger("hydra/test-reframe-server")
 
 const (
 	defaultHTTPAPIAddr = "127.0.0.1:9999"
@@ -28,7 +26,7 @@ func main() {
 	log.Info("starting test routing server")
 
 	mx := http.NewServeMux()
-	mx.HandleFunc(*httpAPIPath, server.FindProvidersAsyncHandler(testFindProvidersAsyncFunc))
+	mx.HandleFunc(*httpAPIPath, server.DelegatedRoutingAsyncHandler(reframe.MockServer{}))
 
 	s := &http.Server{
 		Addr:    *httpAPIAddr,
@@ -37,23 +35,3 @@ func main() {
 	err := s.ListenAndServe()
 	log.Errorf("server died with error (%v)", err)
 }
-
-// testFindProvidersAsyncFunc fulfills find provider requests by returning no results.
-// NOTE: Since it is intended to run in production, as a placeholder delegated routing server for hydra,
-// we probably don't want to return any results as this would:
-//	(a) degrade user experience by pointing to an unresponsive destination
-//	(b) create heavy connection request load (from clients trying to download content) in some IP network.
-//	This could be a problem, if this system is not ours.
-func testFindProvidersAsyncFunc(key cid.Cid, ch chan<- client.FindProvidersAsyncResult) error {
-	// ma := multiaddr.StringCast("/ip4/7.7.7.7/tcp/4242/p2p/QmYyQSo1c1Ym7orWxLYvCrM2EmxFTANf8wXmmE7DWjhx5N")
-	// ai, err := peer.AddrInfoFromP2pAddr(ma)
-	// if err != nil {
-	// 	return fmt.Errorf("address info creation (%v)", err)
-	// }
-	log.Infof("serving find providers request for %v", key.String())
-	go func() {
-		ch <- client.FindProvidersAsyncResult{AddrInfo: []peer.AddrInfo{ /* *ai */ }}
-		close(ch)
-	}()
-	return nil
-}