revert changes to bitswap message, they werent necessary

whyrusleeping · whyrusleeping · commit cece49385590 · 2015-05-12T14:41:11.000-07:00
diff --git a/exchange/bitswap/message/message.go b/exchange/bitswap/message/message.go
@@ -53,7 +53,7 @@ type Exportable interface {
 type impl struct {
 	full     bool
 	wantlist map[u.Key]Entry
-	blocks   []*blocks.Block
+	blocks   map[u.Key]*blocks.Block
 }
 
 func New() BitSwapMessage {
@@ -62,6 +62,7 @@ func New() BitSwapMessage {
 
 func newMsg() *impl {
 	return &impl{
+		blocks:   make(map[u.Key]*blocks.Block),
 		wantlist: make(map[u.Key]Entry),
 		full:     true,
 	}
@@ -106,7 +107,11 @@ func (m *impl) Wantlist() []Entry {
 }
 
 func (m *impl) Blocks() []*blocks.Block {
-	return m.blocks
+	bs := make([]*blocks.Block, 0, len(m.blocks))
+	for _, block := range m.blocks {
+		bs = append(bs, block)
+	}
+	return bs
 }
 
 func (m *impl) Cancel(k u.Key) {
@@ -135,7 +140,7 @@ func (m *impl) addEntry(k u.Key, priority int, cancel bool) {
 }
 
 func (m *impl) AddBlock(b *blocks.Block) {
-	m.blocks = append(m.blocks, b)
+	m.blocks[b.Key()] = b
 }
 
 func FromNet(r io.Reader) (BitSwapMessage, error) {
diff --git a/exchange/bitswap/message/message_test.go b/exchange/bitswap/message/message_test.go
@@ -169,3 +169,20 @@ func contains(strs []string, x string) bool {
 	}
 	return false
 }
+
+func TestDuplicates(t *testing.T) {
+	b := blocks.NewBlock([]byte("foo"))
+	msg := New()
+
+	msg.AddEntry(b.Key(), 1)
+	msg.AddEntry(b.Key(), 1)
+	if len(msg.Wantlist()) != 1 {
+		t.Fatal("Duplicate in BitSwapMessage")
+	}
+
+	msg.AddBlock(b)
+	msg.AddBlock(b)
+	if len(msg.Blocks()) != 1 {
+		t.Fatal("Duplicate in BitSwapMessage")
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ type Exportable interface {`
`53`	`53`	`type impl struct {`
`54`	`54`	`full bool`
`55`	`55`	`wantlist map[u.Key]Entry`
`56`		`- blocks []*blocks.Block`
	`56`	`+ blocks map[u.Key]*blocks.Block`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`func New() BitSwapMessage {`
`@@ -62,6 +62,7 @@ func New() BitSwapMessage {`
`62`	`62`
`63`	`63`	`func newMsg() *impl {`
`64`	`64`	`return &impl{`
	`65`	`+ blocks: make(map[u.Key]*blocks.Block),`
`65`	`66`	`wantlist: make(map[u.Key]Entry),`
`66`	`67`	`full: true,`
`67`	`68`	`}`
`@@ -106,7 +107,11 @@ func (m *impl) Wantlist() []Entry {`
`106`	`107`	`}`
`107`	`108`
`108`	`109`	`func (m impl) Blocks() []blocks.Block {`
`109`		`- return m.blocks`
	`110`	`+ bs := make([]*blocks.Block, 0, len(m.blocks))`
	`111`	`+ for _, block := range m.blocks {`
	`112`	`+ bs = append(bs, block)`
	`113`	`+ }`
	`114`	`+ return bs`
`110`	`115`	`}`
`111`	`116`
`112`	`117`	`func (m *impl) Cancel(k u.Key) {`
`@@ -135,7 +140,7 @@ func (m *impl) addEntry(k u.Key, priority int, cancel bool) {`
`135`	`140`	`}`
`136`	`141`
`137`	`142`	`func (m impl) AddBlock(b blocks.Block) {`
`138`		`- m.blocks = append(m.blocks, b)`
	`143`	`+ m.blocks[b.Key()] = b`
`139`	`144`	`}`
`140`	`145`
`141`	`146`	`func FromNet(r io.Reader) (BitSwapMessage, error) {`