Merge "chat: fixing the bucket name"
diff --git a/Makefile b/Makefile
index 9e795a1..585b920 100644
--- a/Makefile
+++ b/Makefile
@@ -225,11 +225,11 @@
make test-web-runner
endif
-# Note: runner.js sets the NAMESPACE_ROOT and PROXY_ADDR env vars for the
+# Note: runner.js sets the V23_NAMESPACE and PROXY_ADDR env vars for the
# spawned test subprocess; we specify "make test-web-runner" as the test
# command so that we can then reference these vars in the Vanadium extension
# and our prova command.
-test-web-runner: APP_FRAME := "./build/index.html?mtname=$(NAMESPACE_ROOT)"
+test-web-runner: APP_FRAME := "./build/index.html?mtname=$(V23_NAMESPACE)"
test-web-runner: VANADIUM_JS := $(VANADIUM_ROOT)/release/javascript/core
test-web-runner: BROWSER_OPTS := --options="--load-extension=$(VANADIUM_JS)/extension/build-test/,--ignore-certificate-errors,--enable-logging=stderr" $(BROWSER_OPTS)
test-web-runner:
diff --git a/README.md b/README.md
index 5d0f3e9..74936bf 100644
--- a/README.md
+++ b/README.md
@@ -183,7 +183,7 @@
In order for the chat client to talk to the mounttable and proxy servers, you
will need to get an identity from the identity server:
- export VEYRON_CREDENTIALS=/tmp/vanadium-credentials
+ export V23_CREDENTIALS=/tmp/vanadium-credentials
$VANADIUM_ROOT/release/go/bin/principal seekblessings
Then run the binary and pass in the veyron.namespace.root and veyron.proxy
diff --git a/clients/shell/src/chat/channel.go b/clients/shell/src/chat/channel.go
index 0dbbb48..b823f71 100644
--- a/clients/shell/src/chat/channel.go
+++ b/clients/shell/src/chat/channel.go
@@ -39,8 +39,8 @@
"v.io/v23/options"
"v.io/v23/rpc"
"v.io/v23/security"
+ "v.io/v23/security/access"
mt "v.io/v23/services/mounttable"
- "v.io/v23/services/security/access"
_ "v.io/x/ref/profiles/roaming"
diff --git a/clients/shell/src/chat/channel_test.go b/clients/shell/src/chat/channel_test.go
index e9fbc8c..52041fa 100644
--- a/clients/shell/src/chat/channel_test.go
+++ b/clients/shell/src/chat/channel_test.go
@@ -61,8 +61,6 @@
if err != nil {
t.Fatalf("failed to start root mount table: %s", err)
}
- sh.Forget(rootMT)
-
rootMT.ExpectVar("PID")
rootName := rootMT.ExpectVar("MT_NAME")
@@ -70,9 +68,6 @@
if err := sh.Cleanup(nil, nil); err != nil {
t.Fatalf("failed to cleanup shell: %s", rootMT.Error())
}
- if err := rootMT.Shutdown(nil, nil); err != nil {
- t.Fatalf("failed to shutdown root mounttable: %s", rootMT.Error())
- }
}
}
diff --git a/clients/web/js/channel.js b/clients/web/js/channel.js
index 4b30cd9..3f02e73 100644
--- a/clients/web/js/channel.js
+++ b/clients/web/js/channel.js
@@ -9,7 +9,7 @@
var inherits = require('inherits');
var path = require('path');
-var access = require('vanadium/src/gen-vdl/v.io/v23/services/security/access');
+var access = require('vanadium/src/gen-vdl/v.io/v23/security/access');
var naming = require('vanadium').naming;
var noop = require('./noop');
var ServiceVdl = require('./chat/vdl');
