From a2c25e57bd954ce853793587d18905c9cb855a60 Mon Sep 17 00:00:00 2001 From: Louis Thibault <9452561+lthibault@users.noreply.github.com> Date: Fri, 3 Jun 2022 13:22:27 -0400 Subject: [PATCH] Rename package cap to ocap, to avoid colliding with builtin 'cap'. (#31) --- pkg/client/client.go | 6 +++--- pkg/client/dialer.go | 4 ++-- pkg/client/dialer_test.go | 4 ++-- pkg/client/host.go | 4 ++-- pkg/client/pubsub.go | 2 +- pkg/client/pubsub_test.go | 2 +- pkg/{cap => ocap}/anchor/anchor.go | 0 pkg/{cap => ocap}/anchor/client.go | 0 pkg/{cap => ocap}/anchor/path.go | 0 pkg/{cap => ocap}/anchor/path_test.go | 2 +- pkg/{cap => ocap}/anchor/stm.go | 0 pkg/{cap => ocap}/anchor/stm_test.go | 2 +- pkg/{cap => ocap}/channel/channel.go | 0 pkg/{cap => ocap}/channel/client.go | 0 pkg/{cap => ocap}/cluster/host.go | 2 +- pkg/{cap => ocap}/cluster/host_test.go | 4 ++-- pkg/{cap => ocap}/cluster/view.go | 2 +- pkg/{cap => ocap}/cluster/view_test.go | 2 +- pkg/ocap/doc.go | 2 ++ pkg/{cap => ocap}/pubsub/client.go | 0 pkg/{cap => ocap}/pubsub/option.go | 0 pkg/{cap => ocap}/pubsub/pubsub.go | 0 pkg/{cap => ocap}/pubsub/server.go | 2 +- pkg/{cap => ocap}/pubsub/server_test.go | 2 +- pkg/{cap => ocap}/pubsub/subscription_test.go | 2 +- pkg/server/joiner.go | 4 ++-- 26 files changed, 25 insertions(+), 23 deletions(-) rename pkg/{cap => ocap}/anchor/anchor.go (100%) rename pkg/{cap => ocap}/anchor/client.go (100%) rename pkg/{cap => ocap}/anchor/path.go (100%) rename pkg/{cap => ocap}/anchor/path_test.go (99%) rename pkg/{cap => ocap}/anchor/stm.go (100%) rename pkg/{cap => ocap}/anchor/stm_test.go (98%) rename pkg/{cap => ocap}/channel/channel.go (100%) rename pkg/{cap => ocap}/channel/client.go (100%) rename pkg/{cap => ocap}/cluster/host.go (98%) rename pkg/{cap => ocap}/cluster/host_test.go (96%) rename pkg/{cap => ocap}/cluster/view.go (99%) rename pkg/{cap => ocap}/cluster/view_test.go (99%) create mode 100644 pkg/ocap/doc.go rename pkg/{cap => ocap}/pubsub/client.go (100%) rename pkg/{cap => ocap}/pubsub/option.go (100%) rename pkg/{cap => ocap}/pubsub/pubsub.go (100%) rename pkg/{cap => ocap}/pubsub/server.go (99%) rename pkg/{cap => ocap}/pubsub/server_test.go (98%) rename pkg/{cap => ocap}/pubsub/subscription_test.go (98%) diff --git a/pkg/client/client.go b/pkg/client/client.go index b5b25eed..5f183026 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -10,9 +10,9 @@ import ( "capnproto.org/go/capnp/v3/rpc" "github.com/libp2p/go-libp2p-core/host" "github.com/libp2p/go-libp2p-core/peer" - "github.com/wetware/ww/pkg/cap/anchor" - "github.com/wetware/ww/pkg/cap/cluster" - "github.com/wetware/ww/pkg/cap/pubsub" + "github.com/wetware/ww/pkg/ocap/anchor" + "github.com/wetware/ww/pkg/ocap/cluster" + "github.com/wetware/ww/pkg/ocap/pubsub" "github.com/wetware/ww/pkg/vat" ) diff --git a/pkg/client/dialer.go b/pkg/client/dialer.go index 843ab2e5..2f7faccd 100644 --- a/pkg/client/dialer.go +++ b/pkg/client/dialer.go @@ -10,8 +10,8 @@ import ( "github.com/libp2p/go-libp2p-core/peer" "github.com/wetware/casm/pkg/boot" - "github.com/wetware/ww/pkg/cap/cluster" - "github.com/wetware/ww/pkg/cap/pubsub" + "github.com/wetware/ww/pkg/ocap/cluster" + "github.com/wetware/ww/pkg/ocap/pubsub" "github.com/wetware/ww/pkg/vat" ) diff --git a/pkg/client/dialer_test.go b/pkg/client/dialer_test.go index 803bad79..d6907ee6 100644 --- a/pkg/client/dialer_test.go +++ b/pkg/client/dialer_test.go @@ -20,9 +20,9 @@ import ( "github.com/wetware/casm/pkg/boot" clapi "github.com/wetware/ww/internal/api/cluster" psapi "github.com/wetware/ww/internal/api/pubsub" - "github.com/wetware/ww/pkg/cap/cluster" - "github.com/wetware/ww/pkg/cap/pubsub" "github.com/wetware/ww/pkg/client" + "github.com/wetware/ww/pkg/ocap/cluster" + "github.com/wetware/ww/pkg/ocap/pubsub" "github.com/wetware/ww/pkg/vat" ) diff --git a/pkg/client/host.go b/pkg/client/host.go index 13516192..628926bb 100644 --- a/pkg/client/host.go +++ b/pkg/client/host.go @@ -9,8 +9,8 @@ import ( "capnproto.org/go/capnp/v3/rpc" "github.com/libp2p/go-libp2p-core/peer" ma "github.com/multiformats/go-multiaddr" - "github.com/wetware/ww/pkg/cap/anchor" - "github.com/wetware/ww/pkg/cap/cluster" + "github.com/wetware/ww/pkg/ocap/anchor" + "github.com/wetware/ww/pkg/ocap/cluster" "github.com/wetware/ww/pkg/vat" ) diff --git a/pkg/client/pubsub.go b/pkg/client/pubsub.go index 58663d10..5b1009d7 100644 --- a/pkg/client/pubsub.go +++ b/pkg/client/pubsub.go @@ -4,7 +4,7 @@ import ( "context" "capnproto.org/go/capnp/v3" - "github.com/wetware/ww/pkg/cap/pubsub" + "github.com/wetware/ww/pkg/ocap/pubsub" ) type Topic struct { diff --git a/pkg/client/pubsub_test.go b/pkg/client/pubsub_test.go index c97d35f8..1c44a547 100644 --- a/pkg/client/pubsub_test.go +++ b/pkg/client/pubsub_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" chan_api "github.com/wetware/ww/internal/api/channel" api "github.com/wetware/ww/internal/api/pubsub" - "github.com/wetware/ww/pkg/cap/channel" "github.com/wetware/ww/pkg/client" + "github.com/wetware/ww/pkg/ocap/channel" ) func TestSubscription_refcount(t *testing.T) { diff --git a/pkg/cap/anchor/anchor.go b/pkg/ocap/anchor/anchor.go similarity index 100% rename from pkg/cap/anchor/anchor.go rename to pkg/ocap/anchor/anchor.go diff --git a/pkg/cap/anchor/client.go b/pkg/ocap/anchor/client.go similarity index 100% rename from pkg/cap/anchor/client.go rename to pkg/ocap/anchor/client.go diff --git a/pkg/cap/anchor/path.go b/pkg/ocap/anchor/path.go similarity index 100% rename from pkg/cap/anchor/path.go rename to pkg/ocap/anchor/path.go diff --git a/pkg/cap/anchor/path_test.go b/pkg/ocap/anchor/path_test.go similarity index 99% rename from pkg/cap/anchor/path_test.go rename to pkg/ocap/anchor/path_test.go index 36d87fc1..89b5b2c1 100644 --- a/pkg/cap/anchor/path_test.go +++ b/pkg/ocap/anchor/path_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/wetware/ww/pkg/cap/anchor" + "github.com/wetware/ww/pkg/ocap/anchor" ) func TestPath(t *testing.T) { diff --git a/pkg/cap/anchor/stm.go b/pkg/ocap/anchor/stm.go similarity index 100% rename from pkg/cap/anchor/stm.go rename to pkg/ocap/anchor/stm.go diff --git a/pkg/cap/anchor/stm_test.go b/pkg/ocap/anchor/stm_test.go similarity index 98% rename from pkg/cap/anchor/stm_test.go rename to pkg/ocap/anchor/stm_test.go index 46125ed3..122b2c0b 100644 --- a/pkg/cap/anchor/stm_test.go +++ b/pkg/ocap/anchor/stm_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/wetware/ww/pkg/cap/anchor" + "github.com/wetware/ww/pkg/ocap/anchor" ) func TestNewScheduler(t *testing.T) { diff --git a/pkg/cap/channel/channel.go b/pkg/ocap/channel/channel.go similarity index 100% rename from pkg/cap/channel/channel.go rename to pkg/ocap/channel/channel.go diff --git a/pkg/cap/channel/client.go b/pkg/ocap/channel/client.go similarity index 100% rename from pkg/cap/channel/client.go rename to pkg/ocap/channel/client.go diff --git a/pkg/cap/cluster/host.go b/pkg/ocap/cluster/host.go similarity index 98% rename from pkg/cap/cluster/host.go rename to pkg/ocap/cluster/host.go index e7afbf8f..b01cd1b8 100644 --- a/pkg/cap/cluster/host.go +++ b/pkg/ocap/cluster/host.go @@ -9,7 +9,7 @@ import ( "capnproto.org/go/capnp/v3/server" "github.com/libp2p/go-libp2p-core/peer" "github.com/wetware/ww/internal/api/cluster" - "github.com/wetware/ww/pkg/cap/anchor" + "github.com/wetware/ww/pkg/ocap/anchor" "github.com/wetware/ww/pkg/vat" ) diff --git a/pkg/cap/cluster/host_test.go b/pkg/ocap/cluster/host_test.go similarity index 96% rename from pkg/cap/cluster/host_test.go rename to pkg/ocap/cluster/host_test.go index a3298877..87f60566 100644 --- a/pkg/cap/cluster/host_test.go +++ b/pkg/ocap/cluster/host_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/wetware/ww/pkg/cap/anchor" - "github.com/wetware/ww/pkg/cap/cluster" + "github.com/wetware/ww/pkg/ocap/anchor" + "github.com/wetware/ww/pkg/ocap/cluster" ) func TestLs(t *testing.T) { diff --git a/pkg/cap/cluster/view.go b/pkg/ocap/cluster/view.go similarity index 99% rename from pkg/cap/cluster/view.go rename to pkg/ocap/cluster/view.go index a559e588..76d0f76d 100644 --- a/pkg/cap/cluster/view.go +++ b/pkg/ocap/cluster/view.go @@ -11,7 +11,7 @@ import ( "github.com/wetware/casm/pkg/cluster/routing" chan_api "github.com/wetware/ww/internal/api/channel" api "github.com/wetware/ww/internal/api/cluster" - "github.com/wetware/ww/pkg/cap/channel" + "github.com/wetware/ww/pkg/ocap/channel" "github.com/wetware/ww/pkg/vat" "golang.org/x/sync/semaphore" ) diff --git a/pkg/cap/cluster/view_test.go b/pkg/ocap/cluster/view_test.go similarity index 99% rename from pkg/cap/cluster/view_test.go rename to pkg/ocap/cluster/view_test.go index 4a327bdd..7df55e19 100644 --- a/pkg/cap/cluster/view_test.go +++ b/pkg/ocap/cluster/view_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/wetware/casm/pkg/cluster/routing" - "github.com/wetware/ww/pkg/cap/cluster" + "github.com/wetware/ww/pkg/ocap/cluster" ) func TestRecord(t *testing.T) { diff --git a/pkg/ocap/doc.go b/pkg/ocap/doc.go new file mode 100644 index 00000000..5396deb7 --- /dev/null +++ b/pkg/ocap/doc.go @@ -0,0 +1,2 @@ +// Package ocap contains implementations for the object capabilities defined in api/ +package ocap diff --git a/pkg/cap/pubsub/client.go b/pkg/ocap/pubsub/client.go similarity index 100% rename from pkg/cap/pubsub/client.go rename to pkg/ocap/pubsub/client.go diff --git a/pkg/cap/pubsub/option.go b/pkg/ocap/pubsub/option.go similarity index 100% rename from pkg/cap/pubsub/option.go rename to pkg/ocap/pubsub/option.go diff --git a/pkg/cap/pubsub/pubsub.go b/pkg/ocap/pubsub/pubsub.go similarity index 100% rename from pkg/cap/pubsub/pubsub.go rename to pkg/ocap/pubsub/pubsub.go diff --git a/pkg/cap/pubsub/server.go b/pkg/ocap/pubsub/server.go similarity index 99% rename from pkg/cap/pubsub/server.go rename to pkg/ocap/pubsub/server.go index 6239449d..c8192cb2 100644 --- a/pkg/cap/pubsub/server.go +++ b/pkg/ocap/pubsub/server.go @@ -12,7 +12,7 @@ import ( "github.com/lthibault/log" ctxutil "github.com/lthibault/util/ctx" api "github.com/wetware/ww/internal/api/pubsub" - "github.com/wetware/ww/pkg/cap/channel" + "github.com/wetware/ww/pkg/ocap/channel" "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" ) diff --git a/pkg/cap/pubsub/server_test.go b/pkg/ocap/pubsub/server_test.go similarity index 98% rename from pkg/cap/pubsub/server_test.go rename to pkg/ocap/pubsub/server_test.go index d242b391..07a6409b 100644 --- a/pkg/cap/pubsub/server_test.go +++ b/pkg/ocap/pubsub/server_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - pscap "github.com/wetware/ww/pkg/cap/pubsub" + pscap "github.com/wetware/ww/pkg/ocap/pubsub" ) func TestPubSub_refcount(t *testing.T) { diff --git a/pkg/cap/pubsub/subscription_test.go b/pkg/ocap/pubsub/subscription_test.go similarity index 98% rename from pkg/cap/pubsub/subscription_test.go rename to pkg/ocap/pubsub/subscription_test.go index 29d24f6e..f6748fd6 100644 --- a/pkg/cap/pubsub/subscription_test.go +++ b/pkg/ocap/pubsub/subscription_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" chan_api "github.com/wetware/ww/internal/api/channel" api "github.com/wetware/ww/internal/api/pubsub" - "github.com/wetware/ww/pkg/cap/channel" + "github.com/wetware/ww/pkg/ocap/channel" ) func TestSubscription_refcount(t *testing.T) { diff --git a/pkg/server/joiner.go b/pkg/server/joiner.go index d79f0460..4e761de1 100644 --- a/pkg/server/joiner.go +++ b/pkg/server/joiner.go @@ -11,8 +11,8 @@ import ( "github.com/wetware/casm/pkg/cluster" "github.com/wetware/ww/pkg/vat" - cluster_cap "github.com/wetware/ww/pkg/cap/cluster" - pubsub_cap "github.com/wetware/ww/pkg/cap/pubsub" + cluster_cap "github.com/wetware/ww/pkg/ocap/cluster" + pubsub_cap "github.com/wetware/ww/pkg/ocap/pubsub" ) type PubSub interface {