Skip to content

Commit

Permalink
org name change
Browse files Browse the repository at this point in the history
  • Loading branch information
guillaumemichel authored and dennis-tra committed Jan 25, 2024
1 parent c984e5e commit 1ca8e8d
Show file tree
Hide file tree
Showing 70 changed files with 197 additions and 197 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

[![ProbeLab](https://img.shields.io/badge/made%20by-ProbeLab-blue.svg)](https://probelab.io)
[![Libp2p](https://img.shields.io/badge/project-libp2p-yellow.svg)](https://libp2p.io)
[![Build status](https://img.shields.io/github/actions/workflow/status/plprobelab/zikade/go-test.yml?branch=main)](https://github.com/plprobelab/zikade/actions)
[![GoDoc](https://pkg.go.dev/badge/github.com/plprobelab/zikade)](https://pkg.go.dev/github.com/plprobelab/zikade)
[![Build status](https://img.shields.io/github/actions/workflow/status/probe-lab/zikade/go-test.yml?branch=main)](https://github.com/probe-lab/zikade/actions)
[![GoDoc](https://pkg.go.dev/badge/github.com/probe-lab/zikade)](https://pkg.go.dev/github.com/probe-lab/zikade)
[![Discourse posts](https://img.shields.io/discourse/https/discuss.libp2p.io/posts.svg)](https://discuss.libp2p.io)

> A Go implementation of the [libp2p Kademlia DHT specification](https://github.com/libp2p/specs/tree/master/kad-dht).
Expand Down Expand Up @@ -59,7 +59,7 @@ Where possible, Zikade will remain compatible with [go-libp2p-kad-dht](https://g
## Install

```sh
go get github.com/plprobelab/zikade
go get github.com/probe-lab/zikade
```

## Maintainers
Expand All @@ -74,7 +74,7 @@ See [CODEOWNERS](./CODEOWNERS).

Contributions are welcome!

Please take a look at [the issues](https://github.com/plprobelab/zikade/issues).
Please take a look at [the issues](https://github.com/probe-lab/zikade/issues).

This repository is part of the IPFS project and therefore governed by our [contributing guidelines](https://github.com/ipfs/community/blob/master/CONTRIBUTING.md).

Expand Down
4 changes: 2 additions & 2 deletions backend_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"go.opentelemetry.io/otel/metric"
"golang.org/x/exp/slog"

"github.com/plprobelab/zikade/tele"
"github.com/probe-lab/zikade/tele"
)

// ProvidersBackend implements the [Backend] interface and handles provider
Expand Down Expand Up @@ -113,7 +113,7 @@ func DefaultProviderBackendConfig() (*ProvidersBackendConfig, error) {

return &ProvidersBackendConfig{
clk: clock.New(),
ProvideValidity: 48 * time.Hour, // empirically measured in: https://github.com/plprobelab/network-measurements/blob/master/results/rfm17-provider-record-liveness.md
ProvideValidity: 48 * time.Hour, // empirically measured in: https://github.com/probe-lab/network-measurements/blob/master/results/rfm17-provider-record-liveness.md
AddressTTL: 24 * time.Hour, // MAGIC
CacheSize: 256, // MAGIC
GCInterval: time.Hour, // MAGIC
Expand Down
2 changes: 1 addition & 1 deletion backend_provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/stretchr/testify/require"
"golang.org/x/exp/slog"

"github.com/plprobelab/zikade/internal/kadtest"
"github.com/probe-lab/zikade/internal/kadtest"
)

var devnull = slog.New(slog.NewTextHandler(io.Discard, nil))
Expand Down
2 changes: 1 addition & 1 deletion backend_record.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func DefaultRecordBackendConfig() (*RecordBackendConfig, error) {
clk: clock.New(),
Logger: slog.Default(),
Tele: telemetry,
MaxRecordAge: 48 * time.Hour, // empirically measured in: https://github.com/plprobelab/network-measurements/blob/master/results/rfm17-provider-record-liveness.md
MaxRecordAge: 48 * time.Hour, // empirically measured in: https://github.com/probe-lab/network-measurements/blob/master/results/rfm17-provider-record-liveness.md
}, nil
}

Expand Down
2 changes: 1 addition & 1 deletion backend_record_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
record "github.com/libp2p/go-libp2p-record"
"github.com/stretchr/testify/assert"

"github.com/plprobelab/zikade/internal/kadtest"
"github.com/probe-lab/zikade/internal/kadtest"
)

// testValidator is a validator that considers all values valid that have a
Expand Down
6 changes: 3 additions & 3 deletions config.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ import (
"github.com/libp2p/go-libp2p/core/protocol"
ma "github.com/multiformats/go-multiaddr"
manet "github.com/multiformats/go-multiaddr/net"
"github.com/plprobelab/go-libdht/kad/triert"
"github.com/probe-lab/go-libdht/kad/triert"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/trace"
"go.uber.org/zap/exp/zapslog"
"golang.org/x/exp/slog"

"github.com/plprobelab/zikade/internal/coord/routing"
"github.com/plprobelab/zikade/kadt"
"github.com/probe-lab/zikade/internal/coord/routing"
"github.com/probe-lab/zikade/kadt"
)

// ServiceName is used to scope incoming streams for the resource manager.
Expand Down
8 changes: 4 additions & 4 deletions dht.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
"github.com/libp2p/go-libp2p/core/peer"
"golang.org/x/exp/slog"

"github.com/plprobelab/zikade/internal/coord"
"github.com/plprobelab/zikade/internal/coord/routing"
"github.com/plprobelab/zikade/kadt"
"github.com/plprobelab/zikade/tele"
"github.com/probe-lab/zikade/internal/coord"
"github.com/probe-lab/zikade/internal/coord/routing"
"github.com/probe-lab/zikade/kadt"
"github.com/probe-lab/zikade/tele"
)

// DHT is an implementation of Kademlia with S/Kademlia modifications.
Expand Down
4 changes: 2 additions & 2 deletions dht_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/plprobelab/zikade/internal/kadtest"
"github.com/plprobelab/zikade/kadt"
"github.com/probe-lab/zikade/internal/kadtest"
"github.com/probe-lab/zikade/kadt"
)

func TestNew(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions diversity_filter.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/libp2p/go-libp2p/core/host"
"github.com/libp2p/go-libp2p/core/peer"
ma "github.com/multiformats/go-multiaddr"
"github.com/plprobelab/go-libdht/kad/triert"
"github.com/plprobelab/zikade/kadt"
"github.com/probe-lab/go-libdht/kad/triert"
"github.com/probe-lab/zikade/kadt"
)

var _ triert.NodeFilter[kadt.Key, kadt.PeerID] = (*TrieRTPeerDiversityFilter)(nil)
Expand Down
4 changes: 2 additions & 2 deletions diversity_filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/libp2p/go-libp2p-kbucket/peerdiversity"
"github.com/libp2p/go-libp2p/core/peer"
ma "github.com/multiformats/go-multiaddr"
"github.com/plprobelab/go-libdht/kad/triert"
"github.com/plprobelab/zikade/kadt"
"github.com/probe-lab/go-libdht/kad/triert"
"github.com/probe-lab/zikade/kadt"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
)
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/plprobelab/zikade
module github.com/probe-lab/zikade

go 1.20

Expand All @@ -18,7 +18,7 @@ require (
github.com/multiformats/go-multiaddr v0.11.0
github.com/multiformats/go-multihash v0.2.3
github.com/pkg/errors v0.9.1 // indirect
github.com/plprobelab/go-libdht v0.1.0
github.com/probe-lab/go-libdht v0.1.0
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/otel v1.18.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,8 @@ github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhM
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/plprobelab/go-libdht v0.1.0 h1:lcysqaU3hVg2f8I5hZT7XdoPERkrI3HrH5x59LBm7GA=
github.com/plprobelab/go-libdht v0.1.0/go.mod h1:1m6gBp1WX7RPN3KnwC5BX5YZ5nDTy+g6x9M4fgb/n1w=
github.com/probe-lab/go-libdht v0.1.0 h1:lcysqaU3hVg2f8I5hZT7XdoPERkrI3HrH5x59LBm7GA=
github.com/probe-lab/go-libdht v0.1.0/go.mod h1:1m6gBp1WX7RPN3KnwC5BX5YZ5nDTy+g6x9M4fgb/n1w=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/polydawn/refmt v0.89.0 h1:ADJTApkvkeBZsN0tBTx8QjpD9JkmxbKp0cxfr9qszm4=
Expand Down
4 changes: 2 additions & 2 deletions handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
otel "go.opentelemetry.io/otel/trace"
"golang.org/x/exp/slog"

"github.com/plprobelab/zikade/kadt"
"github.com/plprobelab/zikade/pb"
"github.com/probe-lab/zikade/kadt"
"github.com/probe-lab/zikade/pb"
)

// handleFindPeer handles FIND_NODE requests from remote peers.
Expand Down
4 changes: 2 additions & 2 deletions handlers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/proto"

"github.com/plprobelab/zikade/kadt"
"github.com/plprobelab/zikade/pb"
"github.com/probe-lab/zikade/kadt"
"github.com/probe-lab/zikade/pb"
)

func TestMessage_noKey(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
ma "github.com/multiformats/go-multiaddr"
"github.com/stretchr/testify/require"

"github.com/plprobelab/zikade/kadt"
"github.com/plprobelab/zikade/pb"
"github.com/probe-lab/zikade/kadt"
"github.com/probe-lab/zikade/pb"
)

var rng = rand.New(rand.NewSource(1337))
Expand Down
10 changes: 5 additions & 5 deletions internal/coord/brdcst.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"go.opentelemetry.io/otel/trace"
"golang.org/x/exp/slog"

"github.com/plprobelab/zikade/internal/coord/brdcst"
"github.com/plprobelab/zikade/internal/coord/coordt"
"github.com/plprobelab/zikade/kadt"
"github.com/plprobelab/zikade/pb"
"github.com/plprobelab/zikade/tele"
"github.com/probe-lab/zikade/internal/coord/brdcst"
"github.com/probe-lab/zikade/internal/coord/coordt"
"github.com/probe-lab/zikade/kadt"
"github.com/probe-lab/zikade/pb"
"github.com/probe-lab/zikade/tele"
)

type PooledBroadcastBehaviour struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/coord/brdcst/brdcst.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package brdcst

import (
"github.com/plprobelab/go-libdht/kad"
"github.com/probe-lab/go-libdht/kad"

"github.com/plprobelab/zikade/internal/coord/coordt"
"github.com/probe-lab/zikade/internal/coord/coordt"
)

// BroadcastState must be implemented by all states that a [Broadcast] state
Expand Down
2 changes: 1 addition & 1 deletion internal/coord/brdcst/brdcst_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package brdcst
import (
"testing"

"github.com/plprobelab/zikade/internal/tiny"
"github.com/probe-lab/zikade/internal/tiny"
)

func TestBroadcastState_interface_conformance(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/coord/brdcst/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package brdcst
import (
"fmt"

"github.com/plprobelab/zikade/internal/coord/query"
"github.com/probe-lab/zikade/internal/coord/query"
)

// ConfigPool specifies the configuration for a broadcast [Pool].
Expand Down
8 changes: 4 additions & 4 deletions internal/coord/brdcst/followup.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"context"
"fmt"

"github.com/plprobelab/go-libdht/kad"
"github.com/probe-lab/go-libdht/kad"
"go.opentelemetry.io/otel/trace"

"github.com/plprobelab/zikade/internal/coord/coordt"
"github.com/plprobelab/zikade/internal/coord/query"
"github.com/plprobelab/zikade/tele"
"github.com/probe-lab/zikade/internal/coord/coordt"
"github.com/probe-lab/zikade/internal/coord/query"
"github.com/probe-lab/zikade/tele"
)

// FollowUp is a [Broadcast] state machine and encapsulates the logic around
Expand Down
8 changes: 4 additions & 4 deletions internal/coord/brdcst/pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"context"
"fmt"

"github.com/plprobelab/go-libdht/kad"
"github.com/probe-lab/go-libdht/kad"
"go.opentelemetry.io/otel/trace"

"github.com/plprobelab/zikade/internal/coord/coordt"
"github.com/plprobelab/zikade/internal/coord/query"
"github.com/plprobelab/zikade/tele"
"github.com/probe-lab/zikade/internal/coord/coordt"
"github.com/probe-lab/zikade/internal/coord/query"
"github.com/probe-lab/zikade/tele"
)

// Broadcast is a type alias for a specific kind of state machine that any
Expand Down
6 changes: 3 additions & 3 deletions internal/coord/brdcst/pool_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"fmt"
"testing"

"github.com/plprobelab/go-libdht/kad/key"
"github.com/probe-lab/go-libdht/kad/key"
"github.com/stretchr/testify/require"

"github.com/plprobelab/zikade/internal/coord/coordt"
"github.com/plprobelab/zikade/internal/tiny"
"github.com/probe-lab/zikade/internal/coord/coordt"
"github.com/probe-lab/zikade/internal/tiny"
)

// Assert that Pool implements the common state machine interface
Expand Down
6 changes: 3 additions & 3 deletions internal/coord/brdcst/static.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"context"
"fmt"

"github.com/plprobelab/go-libdht/kad"
"github.com/probe-lab/go-libdht/kad"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/trace"

"github.com/plprobelab/zikade/internal/coord/coordt"
"github.com/plprobelab/zikade/tele"
"github.com/probe-lab/zikade/internal/coord/coordt"
"github.com/probe-lab/zikade/tele"
)

// Static is a [Broadcast] state machine and encapsulates the logic around
Expand Down
8 changes: 4 additions & 4 deletions internal/coord/brdcst_events.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package coord

import (
"github.com/plprobelab/zikade/internal/coord/brdcst"
"github.com/plprobelab/zikade/internal/coord/coordt"
"github.com/plprobelab/zikade/kadt"
"github.com/plprobelab/zikade/pb"
"github.com/probe-lab/zikade/internal/coord/brdcst"
"github.com/probe-lab/zikade/internal/coord/coordt"
"github.com/probe-lab/zikade/kadt"
"github.com/probe-lab/zikade/pb"
)

// EventStartBroadcast starts a new
Expand Down
16 changes: 8 additions & 8 deletions internal/coord/coordinator.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ import (
"sync/atomic"

"github.com/benbjohnson/clock"
"github.com/plprobelab/go-libdht/kad"
"github.com/probe-lab/go-libdht/kad"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/trace"
"golang.org/x/exp/slog"

"github.com/plprobelab/zikade/errs"
"github.com/plprobelab/zikade/internal/coord/brdcst"
"github.com/plprobelab/zikade/internal/coord/coordt"
"github.com/plprobelab/zikade/internal/coord/routing"
"github.com/plprobelab/zikade/kadt"
"github.com/plprobelab/zikade/pb"
"github.com/plprobelab/zikade/tele"
"github.com/probe-lab/zikade/errs"
"github.com/probe-lab/zikade/internal/coord/brdcst"
"github.com/probe-lab/zikade/internal/coord/coordt"
"github.com/probe-lab/zikade/internal/coord/routing"
"github.com/probe-lab/zikade/kadt"
"github.com/probe-lab/zikade/pb"
"github.com/probe-lab/zikade/tele"
)

// A Coordinator coordinates the state machines that comprise a Kademlia DHT
Expand Down
10 changes: 5 additions & 5 deletions internal/coord/coordinator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"github.com/benbjohnson/clock"
"github.com/stretchr/testify/require"

"github.com/plprobelab/zikade/internal/coord/coordt"
"github.com/plprobelab/zikade/internal/kadtest"
"github.com/plprobelab/zikade/internal/nettest"
"github.com/plprobelab/zikade/kadt"
"github.com/plprobelab/zikade/pb"
"github.com/probe-lab/zikade/internal/coord/coordt"
"github.com/probe-lab/zikade/internal/kadtest"
"github.com/probe-lab/zikade/internal/nettest"
"github.com/probe-lab/zikade/kadt"
"github.com/probe-lab/zikade/pb"
)

func TestConfigValidate(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions internal/coord/coordt/coretypes.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"errors"
"time"

"github.com/plprobelab/go-libdht/kad"
"github.com/probe-lab/go-libdht/kad"

"github.com/plprobelab/zikade/kadt"
"github.com/plprobelab/zikade/pb"
"github.com/probe-lab/zikade/kadt"
"github.com/probe-lab/zikade/pb"
)

// TODO: rename to something like OperationID. This type isn't only used to identify queries but also other operations like broadcasts.
Expand Down
2 changes: 1 addition & 1 deletion internal/coord/cplutil/cpl.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

mh "github.com/multiformats/go-multihash"

"github.com/plprobelab/zikade/kadt"
"github.com/probe-lab/zikade/kadt"
)

//go:generate go run ./gen.go
Expand Down
Loading

0 comments on commit 1ca8e8d

Please sign in to comment.