chore: upgrade psiphon and go-cmp (#669)

I have experimented with a new approach for embedding psiphon in
https://github.com/ooni/psiphon/commit/7fc0bcd97c5fecd9a8db0c1c01a10c51e5377a40.

It seems the build is still building and the experiment is still
running. With the new approach, we're now vendoring less dependencies,
which hopefully puts us in the right track to, one day, import
Psiphon as a normal Go dependency.

I'll make sure to report to the Psiphon team what is currently
preventing us from importing their ClientLibrary directly.

This work is part of https://github.com/ooni/probe/issues/1894.

As part of running the update, I run `go get -u -v ./...`, which
led to go-cmp also being updated in the process.
This commit is contained in:
Simone Basso
2022-01-21 11:54:48 +01:00
committed by GitHub
parent 64a7a71543
commit 97d2b5a0e3
5 changed files with 154 additions and 23 deletions
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"github.com/cretz/bine/control"
"github.com/cretz/bine/tor"
"github.com/ooni/probe-cli/v3/internal/model"
"github.com/ooni/psiphon/oopsi/github.com/Psiphon-Labs/psiphon-tunnel-core/ClientLibrary/clientlib"
"github.com/ooni/psiphon/tunnel-core/ClientLibrary/clientlib"
"golang.org/x/sys/execabs"
)
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"path/filepath"
"time"
"github.com/ooni/psiphon/oopsi/github.com/Psiphon-Labs/psiphon-tunnel-core/ClientLibrary/clientlib"
"github.com/ooni/psiphon/tunnel-core/ClientLibrary/clientlib"
)
// psiphonTunnel is a psiphon tunnel
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"os"
"testing"
"github.com/ooni/psiphon/oopsi/github.com/Psiphon-Labs/psiphon-tunnel-core/ClientLibrary/clientlib"
"github.com/ooni/psiphon/tunnel-core/ClientLibrary/clientlib"
)
func TestPsiphonWithCancelledContext(t *testing.T) {