Rename package cap to ocap, to avoid colliding with builtin 'cap'. (#31)

wetware · Jun 3, 2022 · a2c25e5 · a2c25e5
1 parent 94e8c50
commit a2c25e5
Show file tree

Hide file tree

Showing 26 changed files with 25 additions and 23 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → pkg/ocap/anchor/anchor.go b/pkg/cap/anchor/anchor.go → pkg/ocap/anchor/anchor.go
diff --git a/pkg/cap/anchor/client.go → pkg/ocap/anchor/client.go b/pkg/cap/anchor/client.go → pkg/ocap/anchor/client.go
diff --git a/pkg/cap/anchor/path.go → pkg/ocap/anchor/path.go b/pkg/cap/anchor/path.go → pkg/ocap/anchor/path.go
diff --git a/pkg/cap/anchor/path_test.go → pkg/ocap/anchor/path_test.go b/pkg/cap/anchor/path_test.go → 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 → pkg/ocap/anchor/stm.go b/pkg/cap/anchor/stm.go → pkg/ocap/anchor/stm.go
diff --git a/pkg/cap/anchor/stm_test.go → pkg/ocap/anchor/stm_test.go b/pkg/cap/anchor/stm_test.go → 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 → pkg/ocap/channel/channel.go b/pkg/cap/channel/channel.go → pkg/ocap/channel/channel.go
diff --git a/pkg/cap/channel/client.go → pkg/ocap/channel/client.go b/pkg/cap/channel/client.go → pkg/ocap/channel/client.go
diff --git a/pkg/cap/cluster/host.go → pkg/ocap/cluster/host.go b/pkg/cap/cluster/host.go → 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 → pkg/ocap/cluster/host_test.go b/pkg/cap/cluster/host_test.go → 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 → pkg/ocap/cluster/view.go b/pkg/cap/cluster/view.go → 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 → pkg/ocap/cluster/view_test.go b/pkg/cap/cluster/view_test.go → 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
@@ -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 → pkg/ocap/pubsub/client.go b/pkg/cap/pubsub/client.go → pkg/ocap/pubsub/client.go
diff --git a/pkg/cap/pubsub/option.go → pkg/ocap/pubsub/option.go b/pkg/cap/pubsub/option.go → pkg/ocap/pubsub/option.go
diff --git a/pkg/cap/pubsub/pubsub.go → pkg/ocap/pubsub/pubsub.go b/pkg/cap/pubsub/pubsub.go → pkg/ocap/pubsub/pubsub.go
diff --git a/pkg/cap/pubsub/server.go → pkg/ocap/pubsub/server.go b/pkg/cap/pubsub/server.go → 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 → pkg/ocap/pubsub/server_test.go b/pkg/cap/pubsub/server_test.go → 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 → pkg/ocap/pubsub/subscription_test.go b/pkg/cap/pubsub/subscription_test.go → 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
@@ -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 {