coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-03-01 22:37:51 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

remove some redundant blockputs to avoid false duplicate block receives

Browse Source
This commit is contained in:
Jeromy 2015-04-29 19:59:18 -07:00
parent 86fb07aed7
commit f998339acb
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
exchange/bitswap/bitswap.go
View File

@ -219,6 +219,15 @@ func (bs *Bitswap) HasBlock(ctx context.Context, blk *blocks.Block) error {
return errors.New("bitswap is closed")
default:
}
has, err := bs.blockstore.Has(blk.Key())
if err != nil {
return err
}
if has {
log.Error(bs.self, "Dup Block! ", blk.Key())
}
if err := bs.blockstore.Put(blk); err != nil {
return err
}

6
exchange/bitswap/bitswap_test.go
View File

@ -69,9 +69,6 @@ func TestGetBlockFromPeerAfterPeerAnnounces(t *testing.T) {
hasBlock := g.Next()
defer hasBlock.Exchange.Close()
if err := hasBlock.Blockstore().Put(block); err != nil {
t.Fatal(err)
}
if err := hasBlock.Exchange.HasBlock(context.Background(), block); err != nil {
t.Fatal(err)
}
@ -136,7 +133,6 @@ func PerformDistributionTest(t *testing.T, numInstances, numBlocks int) {
var blkeys []u.Key
first := instances[0]
for _, b := range blocks {
first.Blockstore().Put(b) // TODO remove. don't need to do this. bitswap owns block
blkeys = append(blkeys, b.Key())
first.Exchange.HasBlock(context.Background(), b)
}
@ -144,7 +140,7 @@ func PerformDistributionTest(t *testing.T, numInstances, numBlocks int) {
t.Log("Distribute!")
wg := sync.WaitGroup{}
for _, inst := range instances {
for _, inst := range instances[1:] {
wg.Add(1)
go func(inst Instance) {
defer wg.Done()