Skip to content
This repository was archived by the owner on Nov 22, 2022. It is now read-only.

upgrading dependencies to pass build, commpatible with go-libp2p v0.13.0 and webrtc/v3 v3.0.16 #43

Closed
wants to merge 2 commits into from
Closed

upgrading dependencies to pass build, commpatible with go-libp2p v0.13.0 and webrtc/v3 v3.0.16 #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1a643e
upgrading dependencies to pass build, commpatible with go-libp2p v0.1…
mearaj Mar 21, 2021
bed52ec
Merge pull request #4 from mearaj/upgrade_dependencies
mearaj Mar 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
ma "github.com/multiformats/go-multiaddr"
manet "github.com/multiformats/go-multiaddr-net"
"github.com/pion/datachannel"
"github.com/pion/webrtc/v2"
"github.com/pion/webrtc/v3"
)

type connConfig struct {
Expand Down Expand Up @@ -188,13 +188,13 @@ func (c *Conn) IsClosed() bool {
}

// OpenStream creates a new stream.
func (c *Conn) OpenStream() (smux.MuxedStream, error) {
func (c *Conn) OpenStream(ctx context.Context) (smux.MuxedStream, error) {
muxed, err := c.getMuxed()
if err != nil {
return nil, err
}
if muxed != nil {
return muxed.OpenStream()
return muxed.OpenStream(ctx)
}

rawDC := c.checkInitChannel()
Expand Down
23 changes: 15 additions & 8 deletions examples/libp2p-echo/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,19 @@ go 1.12
replace github.com/libp2p/go-libp2p-webrtc-direct => ../../

require (
github.com/ipfs/go-log v0.0.1
github.com/libp2p/go-libp2p v0.1.1
github.com/libp2p/go-libp2p-core v0.0.3
github.com/libp2p/go-libp2p-mplex v0.2.1
github.com/libp2p/go-libp2p-webrtc-direct v0.0.0-00010101000000-000000000000
github.com/multiformats/go-multiaddr v0.0.4
github.com/pion/webrtc/v2 v2.0.16
github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc
github.com/ipfs/go-log v1.0.5
github.com/ipfs/go-log/v2 v2.1.3
github.com/koron/go-ssdp v0.0.2 // indirect
github.com/libp2p/go-conn-security-multistream v0.2.1
github.com/libp2p/go-libp2p v0.13.0
github.com/libp2p/go-libp2p-core v0.8.5
github.com/libp2p/go-libp2p-mplex v0.4.1
github.com/libp2p/go-libp2p-transport-upgrader v0.4.2
github.com/libp2p/go-libp2p-webrtc-direct v0.0.0-20201219114432-56b02029fbb8
github.com/multiformats/go-multiaddr v0.3.1
github.com/onsi/ginkgo v1.14.2 // indirect
github.com/onsi/gomega v1.10.3 // indirect
github.com/pion/webrtc/v3 v3.0.16
github.com/whyrusleeping/go-logging v0.0.1
golang.org/x/text v0.3.5 // indirect
)
920 changes: 778 additions & 142 deletions examples/libp2p-echo/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions examples/libp2p-echo/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

mplex "github.com/libp2p/go-libp2p-mplex"
direct "github.com/libp2p/go-libp2p-webrtc-direct"
"github.com/pion/webrtc/v2"
"github.com/pion/webrtc/v3"
)

// makeBasicHost creates a LibP2P host with a random peer ID listening on the
Expand Down Expand Up @@ -89,7 +89,7 @@ func main() {
// LibP2P code uses golog to log messages. They log with different
// string IDs (i.e. "swarm"). We can control the verbosity level for
// all loggers with:
golog.SetAllLoggers(gologging.INFO) // Change to DEBUG for extra info
golog.SetAllLoggers(golog.LogLevel(gologging.INFO)) // Change to DEBUG for extra info

// Parse options from the command line
listenF := flag.Int("l", 0, "wait for incoming connections")
Expand Down
8 changes: 4 additions & 4 deletions examples/standalone/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ go 1.12
replace github.com/libp2p/go-libp2p-webrtc-direct => ../../

require (
github.com/libp2p/go-libp2p-core v0.0.3
github.com/libp2p/go-libp2p-mplex v0.2.1
github.com/libp2p/go-libp2p-core v0.8.5
github.com/libp2p/go-libp2p-mplex v0.4.1
github.com/libp2p/go-libp2p-webrtc-direct v0.0.0-00010101000000-000000000000
github.com/multiformats/go-multiaddr v0.0.4
github.com/pion/webrtc/v2 v2.0.16
github.com/multiformats/go-multiaddr v0.3.1
github.com/pion/webrtc/v3 v3.0.16
)
694 changes: 694 additions & 0 deletions examples/standalone/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions examples/standalone/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ import (
"context"
"flag"
"fmt"
"io/ioutil"

smux "github.com/libp2p/go-libp2p-core/mux"
tpt "github.com/libp2p/go-libp2p-core/transport"
mplex "github.com/libp2p/go-libp2p-mplex"
direct "github.com/libp2p/go-libp2p-webrtc-direct"
ma "github.com/multiformats/go-multiaddr"
"github.com/pion/webrtc/v2"
"github.com/pion/webrtc/v3"
"io/ioutil"
)

const listenFlag = "listen"
Expand Down Expand Up @@ -51,7 +50,7 @@ func main() {
defer c.Close()
fmt.Println("[dialer] Opened connection")

s, err := c.OpenStream()
s, err := c.OpenStream(context.Background())
check(err)
fmt.Println("[dialer] Opened stream")

Expand Down
9 changes: 5 additions & 4 deletions examples/wasm/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ go 1.12
replace github.com/libp2p/go-libp2p-webrtc-direct => ../../

require (
github.com/libp2p/go-libp2p-core v0.0.3
github.com/libp2p/go-libp2p-mplex v0.2.1
github.com/libp2p/go-libp2p-core v0.8.5
github.com/libp2p/go-libp2p-mplex v0.4.1
github.com/libp2p/go-libp2p-webrtc-direct v0.0.0-00010101000000-000000000000
github.com/multiformats/go-multiaddr v0.0.4
github.com/pion/webrtc/v2 v2.0.16
github.com/multiformats/go-multiaddr v0.3.1
github.com/pion/webrtc/v3 v3.0.16
github.com/shurcooL/go-goon v0.0.0-20210110234559-7585751d9a17 // indirect
)
698 changes: 698 additions & 0 deletions examples/wasm/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions examples/wasm/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
mplex "github.com/libp2p/go-libp2p-mplex"
direct "github.com/libp2p/go-libp2p-webrtc-direct"
ma "github.com/multiformats/go-multiaddr"
"github.com/pion/webrtc/v2"
"github.com/pion/webrtc/v3"
)

func main() {
Expand All @@ -30,7 +30,7 @@ func main() {
defer c.Close()
fmt.Println("[dialer] Opened connection")

s, err := c.OpenStream()
s, err := c.OpenStream(context.Background())
check(err)
fmt.Println("[dialer] Opened stream")

Expand Down
37 changes: 30 additions & 7 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,39 @@
module github.com/libp2p/go-libp2p-webrtc-direct

go 1.12
go 1.16

require (
github.com/ipfs/go-log v1.0.4
github.com/libp2p/go-libp2p-core v0.7.0
github.com/libp2p/go-libp2p-mplex v0.3.0
github.com/libp2p/go-libp2p-testing v0.3.0
github.com/btcsuite/btcd v0.21.0-beta // indirect
github.com/google/uuid v1.2.0 // indirect
github.com/ipfs/go-log v1.0.5
github.com/ipfs/go-log/v2 v2.1.3
github.com/klauspost/cpuid/v2 v2.0.5
github.com/libp2p/go-libp2p v0.13.0
github.com/libp2p/go-libp2p-core v0.8.5
github.com/libp2p/go-libp2p-mplex v0.4.1
github.com/libp2p/go-libp2p-testing v0.4.0
github.com/lucas-clemente/quic-go v0.20.0 // indirect
github.com/multiformats/go-multiaddr v0.3.1
github.com/multiformats/go-multiaddr-fmt v0.1.0
github.com/multiformats/go-multiaddr-net v0.2.0
github.com/multiformats/go-multibase v0.0.3
github.com/pion/datachannel v1.4.13
github.com/pion/webrtc/v2 v2.1.18
github.com/multiformats/go-multihash v0.0.15 // indirect
github.com/onsi/ginkgo v1.14.2 // indirect
github.com/onsi/gomega v1.10.3 // indirect
github.com/pion/datachannel v1.4.21
github.com/pion/dtls/v2 v2.0.8
github.com/pion/interceptor v0.0.12 // indirect
github.com/pion/mdns v0.0.5 // indirect
github.com/pion/quic v0.1.4 // indirect
github.com/pion/rtcp v1.2.6 // indirect
github.com/pion/rtp v1.6.2 // indirect
github.com/pion/sctp v1.7.11 // indirect
github.com/pion/srtp v1.5.2 // indirect
github.com/pion/transport v0.12.3 // indirect
github.com/pion/turn/v2 v2.0.5
github.com/pion/udp v0.1.1 // indirect
github.com/pion/webrtc/v3 v3.0.16
golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670 // indirect
golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 // indirect
golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4 // indirect
)
Loading