c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: spin geoipx off geolocate (#893)

Browse source 
A bunch of packages (including oohelperd) just need the ability to
use MaxMind-like databases. They don't need the additional functionality
implemented by the geolocate package. Such a package, in fact, is
mostly (if not only) needed by the engine package.

Therefore, move code to query MaxMind-like databases to a separate
package, and avoid depending on geolocate in all the packages for
which it's sufficient to use geoipx.

Part of https://github.com/ooni/probe/issues/2240
This commit is contained in:
Simone Basso 2022-08-28 20:00:25 +02:00 • committed by GitHub
commit 110a11828b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 224 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

19
internal/engine/session_integration_test.go
View file

@ -13,7 +13,6 @@ import (
"github.com/apex/log"
"github.com/google/go-cmp/cmp"
"github.com/ooni/probe-cli/v3/internal/engine/geolocate"
"github.com/ooni/probe-cli/v3/internal/engine/probeservices"
"github.com/ooni/probe-cli/v3/internal/model"
"github.com/ooni/probe-cli/v3/internal/netxlite"
@ -276,31 +275,31 @@ func TestSessionLocationLookup(t *testing.T) {
if err := sess.MaybeLookupLocation(); err != nil {
t.Fatal(err)
}
if sess.ProbeASNString() == geolocate.DefaultProbeASNString {
if sess.ProbeASNString() == model.DefaultProbeASNString {
t.Fatal("unexpected ProbeASNString")
}
if sess.ProbeASN() == geolocate.DefaultProbeASN {
if sess.ProbeASN() == model.DefaultProbeASN {
t.Fatal("unexpected ProbeASN")
}
if sess.ProbeCC() == geolocate.DefaultProbeCC {
if sess.ProbeCC() == model.DefaultProbeCC {
t.Fatal("unexpected ProbeCC")
}
if sess.ProbeIP() == geolocate.DefaultProbeIP {
if sess.ProbeIP() == model.DefaultProbeIP {
t.Fatal("unexpected ProbeIP")
}
if sess.ProbeNetworkName() == geolocate.DefaultProbeNetworkName {
if sess.ProbeNetworkName() == model.DefaultProbeNetworkName {
t.Fatal("unexpected ProbeNetworkName")
}
if sess.ResolverASN() == geolocate.DefaultResolverASN {
if sess.ResolverASN() == model.DefaultResolverASN {
t.Fatal("unexpected ResolverASN")
}
if sess.ResolverASNString() == geolocate.DefaultResolverASNString {
if sess.ResolverASNString() == model.DefaultResolverASNString {
t.Fatal("unexpected ResolverASNString")
}
if sess.ResolverIP() == geolocate.DefaultResolverIP {
if sess.ResolverIP() == model.DefaultResolverIP {
t.Fatal("unexpected ResolverIP")
}
if sess.ResolverNetworkName() == geolocate.DefaultResolverNetworkName {
if sess.ResolverNetworkName() == model.DefaultResolverNetworkName {
t.Fatal("unexpected ResolverNetworkName")
}
}