Skip to content

Commit

Permalink
Merge branch 'mainnet' into feature/skymsg
Browse files Browse the repository at this point in the history
  • Loading branch information
志宇 authored Jun 1, 2019
2 parents 672be37 + 0c44e34 commit 580642f
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pkg/messaging/client.go → pkg/messaging/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ type clientLink struct {
chans *chanList
}

// Config configures Client.
// Config configures MsgFactory
type Config struct {
PubKey cipher.PubKey
SecKey cipher.SecKey
Expand Down
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions pkg/transport/managed_transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package transport
import (
"math/big"
"sync"
"sync/atomic"

"github.com/google/uuid"
)
Expand Down
7 changes: 3 additions & 4 deletions pkg/transport/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"math/big"
"strings"
"sync"
"sync/atomic"
"time"

"github.com/google/uuid"
Expand Down Expand Up @@ -58,10 +59,8 @@ func NewManager(config *ManagerConfig, factories ...Factory) (*Manager, error) {
factories: fMap,
transports: make(map[uuid.UUID]*ManagedTransport),
entries: mEntries,
// AcceptedTrChan: make(chan *ManagedTransport, 10),
// DialedTrChan: make(chan *ManagedTransport, 10),
TrChan: make(chan *ManagedTransport, 9), //IDK why it was 10 before
doneChan: make(chan struct{}),
TrChan: make(chan *ManagedTransport, 9), // TODO: eliminate or justify buffering here
doneChan: make(chan struct{}),
}, nil
}

Expand Down

0 comments on commit 580642f

Please sign in to comment.