core: Merge the fake runtime into the fake profile.
People need to be able to refer to the fake runtimes methods, that is
the whole point of the fake runtime. However runtime implementations are
moving into internal. There was no need to separate the fake runtime
from the fake profile, so I have just merged the packages.
Change-Id: I95927a30c72df11dc6d9ca5ae8fbd35194ab9ed6
diff --git a/profiles/fake/fake.go b/profiles/fake/fake.go
index 0837993..58ce2c8 100644
--- a/profiles/fake/fake.go
+++ b/profiles/fake/fake.go
@@ -3,8 +3,6 @@
import (
"v.io/v23"
"v.io/v23/context"
-
- "v.io/core/veyron/runtimes/fake"
)
func init() {
@@ -12,5 +10,5 @@
}
func Init(ctx *context.T) (v23.Runtime, *context.T, v23.Shutdown, error) {
- return fake.Init(ctx)
+ return new(ctx)
}
diff --git a/runtimes/fake/fake_test.go b/profiles/fake/fake_test.go
similarity index 100%
rename from runtimes/fake/fake_test.go
rename to profiles/fake/fake_test.go
diff --git a/runtimes/fake/ipc.go b/profiles/fake/ipc.go
similarity index 100%
rename from runtimes/fake/ipc.go
rename to profiles/fake/ipc.go
diff --git a/runtimes/fake/naming.go b/profiles/fake/naming.go
similarity index 100%
rename from runtimes/fake/naming.go
rename to profiles/fake/naming.go
diff --git a/runtimes/fake/runtime.go b/profiles/fake/runtime.go
similarity index 95%
rename from runtimes/fake/runtime.go
rename to profiles/fake/runtime.go
index 94ed44f..19640e5 100644
--- a/runtimes/fake/runtime.go
+++ b/profiles/fake/runtime.go
@@ -22,7 +22,7 @@
type Runtime struct{}
-func Init(ctx *context.T) (*Runtime, *context.T, v23.Shutdown, error) {
+func new(ctx *context.T) (*Runtime, *context.T, v23.Shutdown, error) {
ctx = context.WithValue(ctx, principalKey, tsecurity.NewPrincipal())
return &Runtime{}, ctx, func() {}, nil
}
diff --git a/services/wsprd/lib/signature_manager_test.go b/services/wsprd/lib/signature_manager_test.go
index 89a2a7f..2cf47c5 100644
--- a/services/wsprd/lib/signature_manager_test.go
+++ b/services/wsprd/lib/signature_manager_test.go
@@ -6,8 +6,7 @@
"testing"
"v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles/fake"
- "v.io/core/veyron/runtimes/fake"
+ "v.io/core/veyron/profiles/fake"
mocks_ipc "v.io/core/veyron/runtimes/google/testing/mocks/ipc"
"v.io/v23"
"v.io/v23/context"
