Skip to content
This repository has been archived by the owner on Feb 1, 2023. It is now read-only.

feat: move internals to an internal package #242

Merged
merged 1 commit into from
Jan 31, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions benchmarks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ import (
"testing"
"time"

"github.com/ipfs/go-bitswap/testutil"
"github.com/ipfs/go-bitswap/internal/testutil"
blocks "github.com/ipfs/go-block-format"

bitswap "github.com/ipfs/go-bitswap"
bssession "github.com/ipfs/go-bitswap/session"
testinstance "github.com/ipfs/go-bitswap/testinstance"
tn "github.com/ipfs/go-bitswap/testnet"
bssession "github.com/ipfs/go-bitswap/internal/session"
testinstance "github.com/ipfs/go-bitswap/internal/testinstance"
tn "github.com/ipfs/go-bitswap/internal/testnet"
cid "github.com/ipfs/go-cid"
delay "github.com/ipfs/go-ipfs-delay"
mockrouting "github.com/ipfs/go-ipfs-routing/mock"
Expand Down
24 changes: 12 additions & 12 deletions bitswap.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ import (

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

bsbpm "github.com/ipfs/go-bitswap/blockpresencemanager"
decision "github.com/ipfs/go-bitswap/decision"
bsgetter "github.com/ipfs/go-bitswap/getter"
bsbpm "github.com/ipfs/go-bitswap/internal/blockpresencemanager"
decision "github.com/ipfs/go-bitswap/internal/decision"
bsgetter "github.com/ipfs/go-bitswap/internal/getter"
bsmsg "github.com/ipfs/go-bitswap/message"
bsmq "github.com/ipfs/go-bitswap/messagequeue"
bsmq "github.com/ipfs/go-bitswap/internal/messagequeue"
bsnet "github.com/ipfs/go-bitswap/network"
notifications "github.com/ipfs/go-bitswap/notifications"
bspm "github.com/ipfs/go-bitswap/peermanager"
bspqm "github.com/ipfs/go-bitswap/providerquerymanager"
bssession "github.com/ipfs/go-bitswap/session"
bssim "github.com/ipfs/go-bitswap/sessioninterestmanager"
bssm "github.com/ipfs/go-bitswap/sessionmanager"
bsspm "github.com/ipfs/go-bitswap/sessionpeermanager"
bswm "github.com/ipfs/go-bitswap/wantmanager"
notifications "github.com/ipfs/go-bitswap/internal/notifications"
bspm "github.com/ipfs/go-bitswap/internal/peermanager"
bspqm "github.com/ipfs/go-bitswap/internal/providerquerymanager"
bssession "github.com/ipfs/go-bitswap/internal/session"
bssim "github.com/ipfs/go-bitswap/internal/sessioninterestmanager"
bssm "github.com/ipfs/go-bitswap/internal/sessionmanager"
bsspm "github.com/ipfs/go-bitswap/internal/sessionpeermanager"
bswm "github.com/ipfs/go-bitswap/internal/wantmanager"
blocks "github.com/ipfs/go-block-format"
cid "github.com/ipfs/go-cid"
blockstore "github.com/ipfs/go-ipfs-blockstore"
Expand Down
8 changes: 4 additions & 4 deletions bitswap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"time"

bitswap "github.com/ipfs/go-bitswap"
decision "github.com/ipfs/go-bitswap/decision"
decision "github.com/ipfs/go-bitswap/internal/decision"
"github.com/ipfs/go-bitswap/message"
bssession "github.com/ipfs/go-bitswap/session"
testinstance "github.com/ipfs/go-bitswap/testinstance"
tn "github.com/ipfs/go-bitswap/testnet"
bssession "github.com/ipfs/go-bitswap/internal/session"
testinstance "github.com/ipfs/go-bitswap/internal/testinstance"
tn "github.com/ipfs/go-bitswap/internal/testnet"
blocks "github.com/ipfs/go-block-format"
cid "github.com/ipfs/go-cid"
detectrace "github.com/ipfs/go-detect-race"
Expand Down
4 changes: 2 additions & 2 deletions bitswap_with_sessions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"time"

bitswap "github.com/ipfs/go-bitswap"
bssession "github.com/ipfs/go-bitswap/session"
testinstance "github.com/ipfs/go-bitswap/testinstance"
bssession "github.com/ipfs/go-bitswap/internal/session"
testinstance "github.com/ipfs/go-bitswap/internal/testinstance"
blocks "github.com/ipfs/go-block-format"
cid "github.com/ipfs/go-cid"
blocksutil "github.com/ipfs/go-ipfs-blocksutil"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/ipfs/go-bitswap/testutil"
"github.com/ipfs/go-bitswap/internal/testutil"
peer "github.com/libp2p/go-libp2p-core/peer"

cid "github.com/ipfs/go-cid"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"
"time"

"github.com/ipfs/go-bitswap/testutil"
"github.com/ipfs/go-bitswap/internal/testutil"
cid "github.com/ipfs/go-cid"

blocks "github.com/ipfs/go-block-format"
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions decision/engine_test.go → internal/decision/engine_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"testing"
"time"

lu "github.com/ipfs/go-bitswap/logutil"
lu "github.com/ipfs/go-bitswap/internal/logutil"
message "github.com/ipfs/go-bitswap/message"
pb "github.com/ipfs/go-bitswap/message/pb"
"github.com/ipfs/go-bitswap/testutil"
"github.com/ipfs/go-bitswap/internal/testutil"

blocks "github.com/ipfs/go-block-format"
cid "github.com/ipfs/go-cid"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package decision
import (
"testing"

"github.com/ipfs/go-bitswap/testutil"
"github.com/ipfs/go-bitswap/internal/testutil"
"github.com/ipfs/go-peertaskqueue"
"github.com/ipfs/go-peertaskqueue/peertask"
)
Expand Down
2 changes: 1 addition & 1 deletion getter/getter.go → internal/getter/getter.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"errors"

notifications "github.com/ipfs/go-bitswap/notifications"
notifications "github.com/ipfs/go-bitswap/internal/notifications"
logging "github.com/ipfs/go-log"

blocks "github.com/ipfs/go-block-format"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

"github.com/ipfs/go-bitswap/message"
"github.com/ipfs/go-bitswap/testutil"
"github.com/ipfs/go-bitswap/internal/testutil"
cid "github.com/ipfs/go-cid"

bsmsg "github.com/ipfs/go-bitswap/message"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"
"time"

"github.com/ipfs/go-bitswap/testutil"
"github.com/ipfs/go-bitswap/internal/testutil"
cid "github.com/ipfs/go-cid"

"github.com/libp2p/go-libp2p-core/peer"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"fmt"

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

cid "github.com/ipfs/go-cid"
peer "github.com/libp2p/go-libp2p-core/peer"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package peermanager
import (
"testing"

"github.com/ipfs/go-bitswap/testutil"
"github.com/ipfs/go-bitswap/internal/testutil"

cid "github.com/ipfs/go-cid"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/ipfs/go-bitswap/testutil"
"github.com/ipfs/go-bitswap/internal/testutil"

cid "github.com/ipfs/go-cid"
"github.com/libp2p/go-libp2p-core/peer"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package session
import (
"testing"

"github.com/ipfs/go-bitswap/testutil"
"github.com/ipfs/go-bitswap/internal/testutil"
)

func TestPeerAvailabilityManager(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"math"
"testing"

"github.com/ipfs/go-bitswap/testutil"
"github.com/ipfs/go-bitswap/internal/testutil"
peer "github.com/libp2p/go-libp2p-core/peer"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package session
import (
"testing"

"github.com/ipfs/go-bitswap/testutil"
"github.com/ipfs/go-bitswap/internal/testutil"
)

func TestSendWantBlocksTracker(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions session/session.go → internal/session/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import (
"sync"
"time"

// lu "github.com/ipfs/go-bitswap/logutil"
bsbpm "github.com/ipfs/go-bitswap/blockpresencemanager"
bsgetter "github.com/ipfs/go-bitswap/getter"
notifications "github.com/ipfs/go-bitswap/notifications"
bspm "github.com/ipfs/go-bitswap/peermanager"
bssim "github.com/ipfs/go-bitswap/sessioninterestmanager"
// lu "github.com/ipfs/go-bitswap/internal/logutil"
bsbpm "github.com/ipfs/go-bitswap/internal/blockpresencemanager"
bsgetter "github.com/ipfs/go-bitswap/internal/getter"
notifications "github.com/ipfs/go-bitswap/internal/notifications"
bspm "github.com/ipfs/go-bitswap/internal/peermanager"
bssim "github.com/ipfs/go-bitswap/internal/sessioninterestmanager"
blocks "github.com/ipfs/go-block-format"
cid "github.com/ipfs/go-cid"
delay "github.com/ipfs/go-ipfs-delay"
Expand Down
10 changes: 5 additions & 5 deletions session/session_test.go → internal/session/session_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"testing"
"time"

bsbpm "github.com/ipfs/go-bitswap/blockpresencemanager"
notifications "github.com/ipfs/go-bitswap/notifications"
bspm "github.com/ipfs/go-bitswap/peermanager"
bssim "github.com/ipfs/go-bitswap/sessioninterestmanager"
"github.com/ipfs/go-bitswap/testutil"
bsbpm "github.com/ipfs/go-bitswap/internal/blockpresencemanager"
notifications "github.com/ipfs/go-bitswap/internal/notifications"
bspm "github.com/ipfs/go-bitswap/internal/peermanager"
bssim "github.com/ipfs/go-bitswap/internal/sessioninterestmanager"
"github.com/ipfs/go-bitswap/internal/testutil"
cid "github.com/ipfs/go-cid"
blocksutil "github.com/ipfs/go-ipfs-blocksutil"
delay "github.com/ipfs/go-ipfs-delay"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package session
import (
"testing"

"github.com/ipfs/go-bitswap/testutil"
"github.com/ipfs/go-bitswap/internal/testutil"
cid "github.com/ipfs/go-cid"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package session
import (
"context"

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

cid "github.com/ipfs/go-cid"
peer "github.com/libp2p/go-libp2p-core/peer"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"testing"
"time"

bsbpm "github.com/ipfs/go-bitswap/blockpresencemanager"
bspm "github.com/ipfs/go-bitswap/peermanager"
"github.com/ipfs/go-bitswap/testutil"
bsbpm "github.com/ipfs/go-bitswap/internal/blockpresencemanager"
bspm "github.com/ipfs/go-bitswap/internal/peermanager"
"github.com/ipfs/go-bitswap/internal/testutil"
cid "github.com/ipfs/go-cid"
peer "github.com/libp2p/go-libp2p-core/peer"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package session
import (
"testing"

"github.com/ipfs/go-bitswap/testutil"
"github.com/ipfs/go-bitswap/internal/testutil"
)

func TestEmptyWantInfo(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package sessioninterestmanager

import (
bsswl "github.com/ipfs/go-bitswap/sessionwantlist"
bsswl "github.com/ipfs/go-bitswap/internal/sessionwantlist"
blocks "github.com/ipfs/go-block-format"

cid "github.com/ipfs/go-cid"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package sessioninterestmanager
import (
"testing"

"github.com/ipfs/go-bitswap/testutil"
"github.com/ipfs/go-bitswap/internal/testutil"
cid "github.com/ipfs/go-cid"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
cid "github.com/ipfs/go-cid"
delay "github.com/ipfs/go-ipfs-delay"

bsbpm "github.com/ipfs/go-bitswap/blockpresencemanager"
notifications "github.com/ipfs/go-bitswap/notifications"
bssession "github.com/ipfs/go-bitswap/session"
bssim "github.com/ipfs/go-bitswap/sessioninterestmanager"
bsbpm "github.com/ipfs/go-bitswap/internal/blockpresencemanager"
notifications "github.com/ipfs/go-bitswap/internal/notifications"
bssession "github.com/ipfs/go-bitswap/internal/session"
bssim "github.com/ipfs/go-bitswap/internal/sessioninterestmanager"
exchange "github.com/ipfs/go-ipfs-exchange-interface"
peer "github.com/libp2p/go-libp2p-core/peer"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (

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

bsbpm "github.com/ipfs/go-bitswap/blockpresencemanager"
notifications "github.com/ipfs/go-bitswap/notifications"
bspm "github.com/ipfs/go-bitswap/peermanager"
bssession "github.com/ipfs/go-bitswap/session"
bssim "github.com/ipfs/go-bitswap/sessioninterestmanager"
bsbpm "github.com/ipfs/go-bitswap/internal/blockpresencemanager"
notifications "github.com/ipfs/go-bitswap/internal/notifications"
bspm "github.com/ipfs/go-bitswap/internal/peermanager"
bssession "github.com/ipfs/go-bitswap/internal/session"
bssim "github.com/ipfs/go-bitswap/internal/sessioninterestmanager"

blocks "github.com/ipfs/go-block-format"
cid "github.com/ipfs/go-cid"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"sort"
"time"

bssd "github.com/ipfs/go-bitswap/sessiondata"
bssd "github.com/ipfs/go-bitswap/internal/sessiondata"
logging "github.com/ipfs/go-log"

cid "github.com/ipfs/go-cid"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/ipfs/go-bitswap/testutil"
"github.com/ipfs/go-bitswap/internal/testutil"

cid "github.com/ipfs/go-cid"
peer "github.com/libp2p/go-libp2p-core/peer"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package sessionrequestsplitter
import (
"context"

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

"github.com/ipfs/go-cid"
"github.com/libp2p/go-libp2p-core/peer"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

"github.com/ipfs/go-bitswap/testutil"
"github.com/ipfs/go-bitswap/internal/testutil"
)

func quadEaseOut(t float64) float64 { return t * t }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"os"
"testing"

"github.com/ipfs/go-bitswap/testutil"
"github.com/ipfs/go-bitswap/internal/testutil"

cid "github.com/ipfs/go-cid"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

bitswap "github.com/ipfs/go-bitswap"
bsnet "github.com/ipfs/go-bitswap/network"
tn "github.com/ipfs/go-bitswap/testnet"
tn "github.com/ipfs/go-bitswap/internal/testnet"
ds "github.com/ipfs/go-datastore"
delayed "github.com/ipfs/go-datastore/delayed"
ds_sync "github.com/ipfs/go-datastore/sync"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion testutil/testutil.go → internal/testutil/testutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"math/rand"

bsmsg "github.com/ipfs/go-bitswap/message"
bssd "github.com/ipfs/go-bitswap/sessiondata"
bssd "github.com/ipfs/go-bitswap/internal/sessiondata"
"github.com/ipfs/go-bitswap/wantlist"
blocks "github.com/ipfs/go-block-format"
cid "github.com/ipfs/go-cid"
Expand Down