opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-09-10 14:34:24 +08:00
Code Issues Projects Releases Wiki Activity

add test for reprovider and slight refactor

Browse Source
This commit is contained in:
Jeromy
2015-01-14 22:14:52 +00:00
parent f068c89147
commit a7650b259d
3 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/core.go
View File

@ -2,6 +2,7 @@ package core
import ( import (
"fmt" "fmt"
"time"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58" b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
@ -252,7 +253,7 @@ func (n *IpfsNode) StartOnlineServices() error {
// Start up reprovider system // Start up reprovider system
n.Reprovider = rp.NewReprovider(n.Routing, n.Blockstore) n.Reprovider = rp.NewReprovider(n.Routing, n.Blockstore)
go n.Reprovider.Run(ctx) go n.Reprovider.ProvideEvery(ctx, time.Hour*12)
return nil return nil
} }

8
exchange/reprovide/reprovide.go
View File

@ -27,20 +27,20 @@ func NewReprovider(rsys routing.IpfsRouting, bstore blocks.Blockstore) *Reprovid
} }
} }
func (rp *Reprovider) Run(ctx context.Context) { func (rp *Reprovider) ProvideEvery(ctx context.Context, tick time.Duration) {
after := time.After(0) after := time.After(0)
for { for {
select { select {
case <-ctx.Done(): case <-ctx.Done():
return return
case <-after: case <-after:
rp.reprovide(ctx) rp.Reprovide(ctx)
after = time.After(time.Hour * 12) after = time.After(tick)
} }
} }
} }
func (rp *Reprovider) reprovide(ctx context.Context) { func (rp *Reprovider) Reprovide(ctx context.Context) {
keychan, err := rp.bstore.AllKeysChan(ctx, 0, 1<<16) keychan, err := rp.bstore.AllKeysChan(ctx, 0, 1<<16)
if err != nil { if err != nil {
log.Errorf("Failed to get key chan from blockstore: %s", err) log.Errorf("Failed to get key chan from blockstore: %s", err)

50
exchange/reprovide/reprovide_test.go Normal file
View File

@ -0,0 +1,50 @@
package reprovide_test
import (
"testing"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
blocks "github.com/jbenet/go-ipfs/blocks"
blockstore "github.com/jbenet/go-ipfs/blocks/blockstore"
mock "github.com/jbenet/go-ipfs/routing/mock"
testutil "github.com/jbenet/go-ipfs/util/testutil"
. "github.com/jbenet/go-ipfs/exchange/reprovide"
)
func TestReprovide(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
mrserv := mock.NewServer()
idA := testutil.RandIdentityOrFatal(t)
idB := testutil.RandIdentityOrFatal(t)
clA := mrserv.Client(idA)
clB := mrserv.Client(idB)
bstore := blockstore.NewBlockstore(dssync.MutexWrap(ds.NewMapDatastore()))
blk := blocks.NewBlock([]byte("this is a test"))
bstore.Put(blk)
reprov := NewReprovider(clA, bstore)
reprov.Reprovide(ctx)
provs, err := clB.FindProviders(ctx, blk.Key())
if err != nil {
t.Fatal(err)
}
if len(provs) == 0 {
t.Fatal("Should have gotten a provider")
}
if provs[0].ID != idA.ID() {
t.Fatal("Somehow got the wrong peer back as a provider.")
}
}