Skip to content

Commit 99186f4

Browse files
authored
Merge pull request ipfs/go-bitswap#242 from ipfs/feat/internal
feat: move internals to an internal package This commit was moved from ipfs/go-bitswap@0b77d90
2 parents fcea5cd + 0fb8717 commit 99186f4

File tree

67 files changed

+81
-81
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+81
-81
lines changed

bitswap/benchmarks_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import (
1313
"testing"
1414
"time"
1515

16-
"github.com/ipfs/go-bitswap/testutil"
16+
"github.com/ipfs/go-bitswap/internal/testutil"
1717
blocks "github.com/ipfs/go-block-format"
1818

1919
bitswap "github.com/ipfs/go-bitswap"
20-
bssession "github.com/ipfs/go-bitswap/session"
21-
testinstance "github.com/ipfs/go-bitswap/testinstance"
22-
tn "github.com/ipfs/go-bitswap/testnet"
20+
bssession "github.com/ipfs/go-bitswap/internal/session"
21+
testinstance "github.com/ipfs/go-bitswap/internal/testinstance"
22+
tn "github.com/ipfs/go-bitswap/internal/testnet"
2323
cid "github.com/ipfs/go-cid"
2424
delay "github.com/ipfs/go-ipfs-delay"
2525
mockrouting "github.com/ipfs/go-ipfs-routing/mock"

bitswap/bitswap.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ import (
1111

1212
delay "github.com/ipfs/go-ipfs-delay"
1313

14-
bsbpm "github.com/ipfs/go-bitswap/blockpresencemanager"
15-
decision "github.com/ipfs/go-bitswap/decision"
16-
bsgetter "github.com/ipfs/go-bitswap/getter"
14+
bsbpm "github.com/ipfs/go-bitswap/internal/blockpresencemanager"
15+
decision "github.com/ipfs/go-bitswap/internal/decision"
16+
bsgetter "github.com/ipfs/go-bitswap/internal/getter"
1717
bsmsg "github.com/ipfs/go-bitswap/message"
18-
bsmq "github.com/ipfs/go-bitswap/messagequeue"
18+
bsmq "github.com/ipfs/go-bitswap/internal/messagequeue"
1919
bsnet "github.com/ipfs/go-bitswap/network"
20-
notifications "github.com/ipfs/go-bitswap/notifications"
21-
bspm "github.com/ipfs/go-bitswap/peermanager"
22-
bspqm "github.com/ipfs/go-bitswap/providerquerymanager"
23-
bssession "github.com/ipfs/go-bitswap/session"
24-
bssim "github.com/ipfs/go-bitswap/sessioninterestmanager"
25-
bssm "github.com/ipfs/go-bitswap/sessionmanager"
26-
bsspm "github.com/ipfs/go-bitswap/sessionpeermanager"
27-
bswm "github.com/ipfs/go-bitswap/wantmanager"
20+
notifications "github.com/ipfs/go-bitswap/internal/notifications"
21+
bspm "github.com/ipfs/go-bitswap/internal/peermanager"
22+
bspqm "github.com/ipfs/go-bitswap/internal/providerquerymanager"
23+
bssession "github.com/ipfs/go-bitswap/internal/session"
24+
bssim "github.com/ipfs/go-bitswap/internal/sessioninterestmanager"
25+
bssm "github.com/ipfs/go-bitswap/internal/sessionmanager"
26+
bsspm "github.com/ipfs/go-bitswap/internal/sessionpeermanager"
27+
bswm "github.com/ipfs/go-bitswap/internal/wantmanager"
2828
blocks "github.com/ipfs/go-block-format"
2929
cid "github.com/ipfs/go-cid"
3030
blockstore "github.com/ipfs/go-ipfs-blockstore"

bitswap/bitswap_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99
"time"
1010

1111
bitswap "github.com/ipfs/go-bitswap"
12-
decision "github.com/ipfs/go-bitswap/decision"
12+
decision "github.com/ipfs/go-bitswap/internal/decision"
1313
"github.com/ipfs/go-bitswap/message"
14-
bssession "github.com/ipfs/go-bitswap/session"
15-
testinstance "github.com/ipfs/go-bitswap/testinstance"
16-
tn "github.com/ipfs/go-bitswap/testnet"
14+
bssession "github.com/ipfs/go-bitswap/internal/session"
15+
testinstance "github.com/ipfs/go-bitswap/internal/testinstance"
16+
tn "github.com/ipfs/go-bitswap/internal/testnet"
1717
blocks "github.com/ipfs/go-block-format"
1818
cid "github.com/ipfs/go-cid"
1919
detectrace "github.com/ipfs/go-detect-race"

bitswap/bitswap_with_sessions_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"time"
88

99
bitswap "github.com/ipfs/go-bitswap"
10-
bssession "github.com/ipfs/go-bitswap/session"
11-
testinstance "github.com/ipfs/go-bitswap/testinstance"
10+
bssession "github.com/ipfs/go-bitswap/internal/session"
11+
testinstance "github.com/ipfs/go-bitswap/internal/testinstance"
1212
blocks "github.com/ipfs/go-block-format"
1313
cid "github.com/ipfs/go-cid"
1414
blocksutil "github.com/ipfs/go-ipfs-blocksutil"

bitswap/blockpresencemanager/blockpresencemanager_test.go bitswap/internal/blockpresencemanager/blockpresencemanager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"testing"
66

7-
"github.com/ipfs/go-bitswap/testutil"
7+
"github.com/ipfs/go-bitswap/internal/testutil"
88
peer "github.com/libp2p/go-libp2p-core/peer"
99

1010
cid "github.com/ipfs/go-cid"

bitswap/decision/blockstoremanager_test.go bitswap/internal/decision/blockstoremanager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/ipfs/go-bitswap/testutil"
10+
"github.com/ipfs/go-bitswap/internal/testutil"
1111
cid "github.com/ipfs/go-cid"
1212

1313
blocks "github.com/ipfs/go-block-format"
File renamed without changes.

bitswap/decision/engine_test.go bitswap/internal/decision/engine_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"testing"
1111
"time"
1212

13-
lu "github.com/ipfs/go-bitswap/logutil"
13+
lu "github.com/ipfs/go-bitswap/internal/logutil"
1414
message "github.com/ipfs/go-bitswap/message"
1515
pb "github.com/ipfs/go-bitswap/message/pb"
16-
"github.com/ipfs/go-bitswap/testutil"
16+
"github.com/ipfs/go-bitswap/internal/testutil"
1717

1818
blocks "github.com/ipfs/go-block-format"
1919
cid "github.com/ipfs/go-cid"
File renamed without changes.
File renamed without changes.
File renamed without changes.

bitswap/decision/taskmerger_test.go bitswap/internal/decision/taskmerger_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package decision
33
import (
44
"testing"
55

6-
"github.com/ipfs/go-bitswap/testutil"
6+
"github.com/ipfs/go-bitswap/internal/testutil"
77
"github.com/ipfs/go-peertaskqueue"
88
"github.com/ipfs/go-peertaskqueue/peertask"
99
)

bitswap/getter/getter.go bitswap/internal/getter/getter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"errors"
66

7-
notifications "github.com/ipfs/go-bitswap/notifications"
7+
notifications "github.com/ipfs/go-bitswap/internal/notifications"
88
logging "github.com/ipfs/go-log"
99

1010
blocks "github.com/ipfs/go-block-format"
File renamed without changes.

bitswap/messagequeue/messagequeue_test.go bitswap/internal/messagequeue/messagequeue_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"time"
88

99
"github.com/ipfs/go-bitswap/message"
10-
"github.com/ipfs/go-bitswap/testutil"
10+
"github.com/ipfs/go-bitswap/internal/testutil"
1111
cid "github.com/ipfs/go-cid"
1212

1313
bsmsg "github.com/ipfs/go-bitswap/message"
File renamed without changes.

bitswap/peermanager/peermanager_test.go bitswap/internal/peermanager/peermanager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66
"time"
77

8-
"github.com/ipfs/go-bitswap/testutil"
8+
"github.com/ipfs/go-bitswap/internal/testutil"
99
cid "github.com/ipfs/go-cid"
1010

1111
"github.com/libp2p/go-libp2p-core/peer"

bitswap/peermanager/peerwantmanager.go bitswap/internal/peermanager/peerwantmanager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"bytes"
55
"fmt"
66

7-
lu "github.com/ipfs/go-bitswap/logutil"
7+
lu "github.com/ipfs/go-bitswap/internal/logutil"
88

99
cid "github.com/ipfs/go-cid"
1010
peer "github.com/libp2p/go-libp2p-core/peer"

bitswap/peermanager/peerwantmanager_test.go bitswap/internal/peermanager/peerwantmanager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package peermanager
33
import (
44
"testing"
55

6-
"github.com/ipfs/go-bitswap/testutil"
6+
"github.com/ipfs/go-bitswap/internal/testutil"
77

88
cid "github.com/ipfs/go-cid"
99
)

bitswap/providerquerymanager/providerquerymanager_test.go bitswap/internal/providerquerymanager/providerquerymanager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"testing"
99
"time"
1010

11-
"github.com/ipfs/go-bitswap/testutil"
11+
"github.com/ipfs/go-bitswap/internal/testutil"
1212

1313
cid "github.com/ipfs/go-cid"
1414
"github.com/libp2p/go-libp2p-core/peer"
File renamed without changes.

bitswap/session/peeravailabilitymanager_test.go bitswap/internal/session/peeravailabilitymanager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package session
33
import (
44
"testing"
55

6-
"github.com/ipfs/go-bitswap/testutil"
6+
"github.com/ipfs/go-bitswap/internal/testutil"
77
)
88

99
func TestPeerAvailabilityManager(t *testing.T) {

bitswap/session/peerresponsetracker_test.go bitswap/internal/session/peerresponsetracker_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"math"
55
"testing"
66

7-
"github.com/ipfs/go-bitswap/testutil"
7+
"github.com/ipfs/go-bitswap/internal/testutil"
88
peer "github.com/libp2p/go-libp2p-core/peer"
99
)
1010

bitswap/session/sentwantblockstracker_test.go bitswap/internal/session/sentwantblockstracker_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package session
33
import (
44
"testing"
55

6-
"github.com/ipfs/go-bitswap/testutil"
6+
"github.com/ipfs/go-bitswap/internal/testutil"
77
)
88

99
func TestSendWantBlocksTracker(t *testing.T) {

bitswap/session/session.go bitswap/internal/session/session.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import (
55
"sync"
66
"time"
77

8-
// lu "github.com/ipfs/go-bitswap/logutil"
9-
bsbpm "github.com/ipfs/go-bitswap/blockpresencemanager"
10-
bsgetter "github.com/ipfs/go-bitswap/getter"
11-
notifications "github.com/ipfs/go-bitswap/notifications"
12-
bspm "github.com/ipfs/go-bitswap/peermanager"
13-
bssim "github.com/ipfs/go-bitswap/sessioninterestmanager"
8+
// lu "github.com/ipfs/go-bitswap/internal/logutil"
9+
bsbpm "github.com/ipfs/go-bitswap/internal/blockpresencemanager"
10+
bsgetter "github.com/ipfs/go-bitswap/internal/getter"
11+
notifications "github.com/ipfs/go-bitswap/internal/notifications"
12+
bspm "github.com/ipfs/go-bitswap/internal/peermanager"
13+
bssim "github.com/ipfs/go-bitswap/internal/sessioninterestmanager"
1414
blocks "github.com/ipfs/go-block-format"
1515
cid "github.com/ipfs/go-cid"
1616
delay "github.com/ipfs/go-ipfs-delay"

bitswap/session/session_test.go bitswap/internal/session/session_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import (
55
"testing"
66
"time"
77

8-
bsbpm "github.com/ipfs/go-bitswap/blockpresencemanager"
9-
notifications "github.com/ipfs/go-bitswap/notifications"
10-
bspm "github.com/ipfs/go-bitswap/peermanager"
11-
bssim "github.com/ipfs/go-bitswap/sessioninterestmanager"
12-
"github.com/ipfs/go-bitswap/testutil"
8+
bsbpm "github.com/ipfs/go-bitswap/internal/blockpresencemanager"
9+
notifications "github.com/ipfs/go-bitswap/internal/notifications"
10+
bspm "github.com/ipfs/go-bitswap/internal/peermanager"
11+
bssim "github.com/ipfs/go-bitswap/internal/sessioninterestmanager"
12+
"github.com/ipfs/go-bitswap/internal/testutil"
1313
cid "github.com/ipfs/go-cid"
1414
blocksutil "github.com/ipfs/go-ipfs-blocksutil"
1515
delay "github.com/ipfs/go-ipfs-delay"
File renamed without changes.

bitswap/session/sessionwants_test.go bitswap/internal/session/sessionwants_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package session
33
import (
44
"testing"
55

6-
"github.com/ipfs/go-bitswap/testutil"
6+
"github.com/ipfs/go-bitswap/internal/testutil"
77
cid "github.com/ipfs/go-cid"
88
)
99

bitswap/session/sessionwantsender.go bitswap/internal/session/sessionwantsender.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package session
33
import (
44
"context"
55

6-
bsbpm "github.com/ipfs/go-bitswap/blockpresencemanager"
6+
bsbpm "github.com/ipfs/go-bitswap/internal/blockpresencemanager"
77

88
cid "github.com/ipfs/go-cid"
99
peer "github.com/libp2p/go-libp2p-core/peer"

bitswap/session/sessionwantsender_test.go bitswap/internal/session/sessionwantsender_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"testing"
77
"time"
88

9-
bsbpm "github.com/ipfs/go-bitswap/blockpresencemanager"
10-
bspm "github.com/ipfs/go-bitswap/peermanager"
11-
"github.com/ipfs/go-bitswap/testutil"
9+
bsbpm "github.com/ipfs/go-bitswap/internal/blockpresencemanager"
10+
bspm "github.com/ipfs/go-bitswap/internal/peermanager"
11+
"github.com/ipfs/go-bitswap/internal/testutil"
1212
cid "github.com/ipfs/go-cid"
1313
peer "github.com/libp2p/go-libp2p-core/peer"
1414
)

bitswap/session/wantinfo_test.go bitswap/internal/session/wantinfo_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package session
33
import (
44
"testing"
55

6-
"github.com/ipfs/go-bitswap/testutil"
6+
"github.com/ipfs/go-bitswap/internal/testutil"
77
)
88

99
func TestEmptyWantInfo(t *testing.T) {
File renamed without changes.

bitswap/sessioninterestmanager/sessioninterestmanager.go bitswap/internal/sessioninterestmanager/sessioninterestmanager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package sessioninterestmanager
22

33
import (
4-
bsswl "github.com/ipfs/go-bitswap/sessionwantlist"
4+
bsswl "github.com/ipfs/go-bitswap/internal/sessionwantlist"
55
blocks "github.com/ipfs/go-block-format"
66

77
cid "github.com/ipfs/go-cid"

bitswap/sessioninterestmanager/sessioninterestmanager_test.go bitswap/internal/sessioninterestmanager/sessioninterestmanager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package sessioninterestmanager
33
import (
44
"testing"
55

6-
"github.com/ipfs/go-bitswap/testutil"
6+
"github.com/ipfs/go-bitswap/internal/testutil"
77
cid "github.com/ipfs/go-cid"
88
)
99

bitswap/sessionmanager/sessionmanager.go bitswap/internal/sessionmanager/sessionmanager.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
cid "github.com/ipfs/go-cid"
99
delay "github.com/ipfs/go-ipfs-delay"
1010

11-
bsbpm "github.com/ipfs/go-bitswap/blockpresencemanager"
12-
notifications "github.com/ipfs/go-bitswap/notifications"
13-
bssession "github.com/ipfs/go-bitswap/session"
14-
bssim "github.com/ipfs/go-bitswap/sessioninterestmanager"
11+
bsbpm "github.com/ipfs/go-bitswap/internal/blockpresencemanager"
12+
notifications "github.com/ipfs/go-bitswap/internal/notifications"
13+
bssession "github.com/ipfs/go-bitswap/internal/session"
14+
bssim "github.com/ipfs/go-bitswap/internal/sessioninterestmanager"
1515
exchange "github.com/ipfs/go-ipfs-exchange-interface"
1616
peer "github.com/libp2p/go-libp2p-core/peer"
1717
)

bitswap/sessionmanager/sessionmanager_test.go bitswap/internal/sessionmanager/sessionmanager_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77

88
delay "github.com/ipfs/go-ipfs-delay"
99

10-
bsbpm "github.com/ipfs/go-bitswap/blockpresencemanager"
11-
notifications "github.com/ipfs/go-bitswap/notifications"
12-
bspm "github.com/ipfs/go-bitswap/peermanager"
13-
bssession "github.com/ipfs/go-bitswap/session"
14-
bssim "github.com/ipfs/go-bitswap/sessioninterestmanager"
10+
bsbpm "github.com/ipfs/go-bitswap/internal/blockpresencemanager"
11+
notifications "github.com/ipfs/go-bitswap/internal/notifications"
12+
bspm "github.com/ipfs/go-bitswap/internal/peermanager"
13+
bssession "github.com/ipfs/go-bitswap/internal/session"
14+
bssim "github.com/ipfs/go-bitswap/internal/sessioninterestmanager"
1515

1616
blocks "github.com/ipfs/go-block-format"
1717
cid "github.com/ipfs/go-cid"

bitswap/sessionpeermanager/sessionpeermanager.go bitswap/internal/sessionpeermanager/sessionpeermanager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"sort"
88
"time"
99

10-
bssd "github.com/ipfs/go-bitswap/sessiondata"
10+
bssd "github.com/ipfs/go-bitswap/internal/sessiondata"
1111
logging "github.com/ipfs/go-log"
1212

1313
cid "github.com/ipfs/go-cid"

bitswap/sessionpeermanager/sessionpeermanager_test.go bitswap/internal/sessionpeermanager/sessionpeermanager_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"testing"
99
"time"
1010

11-
"github.com/ipfs/go-bitswap/testutil"
11+
"github.com/ipfs/go-bitswap/internal/testutil"
1212

1313
cid "github.com/ipfs/go-cid"
1414
peer "github.com/libp2p/go-libp2p-core/peer"

bitswap/sessionrequestsplitter/sessionrequestsplitter.go bitswap/internal/sessionrequestsplitter/sessionrequestsplitter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package sessionrequestsplitter
33
import (
44
"context"
55

6-
bssd "github.com/ipfs/go-bitswap/sessiondata"
6+
bssd "github.com/ipfs/go-bitswap/internal/sessiondata"
77

88
"github.com/ipfs/go-cid"
99
"github.com/libp2p/go-libp2p-core/peer"

bitswap/sessionrequestsplitter/sessionrequestsplitter_test.go bitswap/internal/sessionrequestsplitter/sessionrequestsplitter_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/ipfs/go-bitswap/testutil"
7+
"github.com/ipfs/go-bitswap/internal/testutil"
88
)
99

1010
func quadEaseOut(t float64) float64 { return t * t }

bitswap/sessionwantlist/sessionwantlist_test.go bitswap/internal/sessionwantlist/sessionwantlist_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"os"
55
"testing"
66

7-
"github.com/ipfs/go-bitswap/testutil"
7+
"github.com/ipfs/go-bitswap/internal/testutil"
88

99
cid "github.com/ipfs/go-cid"
1010
)

bitswap/testinstance/testinstance.go bitswap/internal/testinstance/testinstance.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
bitswap "github.com/ipfs/go-bitswap"
88
bsnet "github.com/ipfs/go-bitswap/network"
9-
tn "github.com/ipfs/go-bitswap/testnet"
9+
tn "github.com/ipfs/go-bitswap/internal/testnet"
1010
ds "github.com/ipfs/go-datastore"
1111
delayed "github.com/ipfs/go-datastore/delayed"
1212
ds_sync "github.com/ipfs/go-datastore/sync"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

bitswap/testutil/testutil.go bitswap/internal/testutil/testutil.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"math/rand"
55

66
bsmsg "github.com/ipfs/go-bitswap/message"
7-
bssd "github.com/ipfs/go-bitswap/sessiondata"
7+
bssd "github.com/ipfs/go-bitswap/internal/sessiondata"
88
"github.com/ipfs/go-bitswap/wantlist"
99
blocks "github.com/ipfs/go-block-format"
1010
cid "github.com/ipfs/go-cid"
File renamed without changes.

0 commit comments

Comments
 (0)