diff --git a/core/commands/experimental.go b/core/commands/experimental.go deleted file mode 100644 index ae66b73faa8..00000000000 --- a/core/commands/experimental.go +++ /dev/null @@ -1,15 +0,0 @@ -package commands - -import ( - cmds "github.com/ipfs/go-ipfs/commands" -) - -var ExpCmd = &cmds.Command{ - Helptext: cmds.HelpText{ - Tagline: "Experimental commands", - ShortDescription: `'ipfs exp' groups experimental features that are subject to change or removal at any time.`, - }, - Subcommands: map[string]*cmds.Command{ - "corenet": CorenetCmd, - }, -} diff --git a/core/commands/root.go b/core/commands/root.go index 9ee07e036e4..45dcb11129a 100644 --- a/core/commands/root.go +++ b/core/commands/root.go @@ -99,11 +99,11 @@ var rootSubcommands = map[string]*cmds.Command{ "cat": CatCmd, "commands": CommandsDaemonCmd, "config": ConfigCmd, + "corenet": CorenetCmd, "dag": dag.DagCmd, "dht": DhtCmd, "diag": DiagCmd, "dns": DNSCmd, - "exp": ExpCmd, "files": files.FilesCmd, "get": GetCmd, "id": IDCmd, diff --git a/test/sharness/t0180-corenet.sh b/test/sharness/t0180-corenet.sh index c1e0eb52962..cbd8706b7ad 100755 --- a/test/sharness/t0180-corenet.sh +++ b/test/sharness/t0180-corenet.sh @@ -36,14 +36,14 @@ test_expect_success "enable filestore config setting" ' ' test_expect_success 'start corenet listener' ' - ipfsi 0 exp corenet listen corenet-test /ip4/127.0.0.1/tcp/10101 2>&1 > listener-stdouterr.log + ipfsi 0 corenet listen corenet-test /ip4/127.0.0.1/tcp/10101 2>&1 > listener-stdouterr.log ' test_expect_success 'Test server to client communications' ' ma-pipe-unidir --listen send /ip4/127.0.0.1/tcp/10101 < corenet0.bin & SERVER_PID=$! - ipfsi 1 exp corenet dial $PEERID_0 corenet-test /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log && + ipfsi 1 corenet dial $PEERID_0 corenet-test /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log && ma-pipe-unidir recv /ip4/127.0.0.1/tcp/10102 > client.out && wait $SERVER_PID ' @@ -52,7 +52,7 @@ test_expect_success 'Test client to server communications' ' ma-pipe-unidir --listen recv /ip4/127.0.0.1/tcp/10101 > server.out & SERVER_PID=$! - ipfsi 1 exp corenet dial $PEERID_0 corenet-test /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log && + ipfsi 1 corenet dial $PEERID_0 corenet-test /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log && ma-pipe-unidir send /ip4/127.0.0.1/tcp/10102 < corenet1.bin wait $SERVER_PID ' @@ -67,7 +67,7 @@ test_expect_success 'client to server output looks good' ' test_expect_success "'ipfs corenet ls' succeeds" ' echo "/ip4/127.0.0.1/tcp/10101 /app/corenet-test" > expected && - ipfsi 0 exp corenet ls > actual + ipfsi 0 corenet ls > actual ' test_expect_success "'ipfs corenet ls' output looks good" ' @@ -75,18 +75,18 @@ test_expect_success "'ipfs corenet ls' output looks good" ' ' test_expect_success "Cannot re-register app handler" ' - (! ipfsi 0 exp corenet listen corenet-test /ip4/127.0.0.1/tcp/10101) + (! ipfsi 0 corenet listen corenet-test /ip4/127.0.0.1/tcp/10101) ' test_expect_success "'ipfs corenet streams' output is empty" ' - ipfsi 0 exp corenet streams > actual && + ipfsi 0 corenet streams > actual && test_must_be_empty actual ' test_expect_success "Setup: Idle stream" ' ma-pipe-unidir --listen --pidFile=listener.pid recv /ip4/127.0.0.1/tcp/10101 & - ipfsi 1 exp corenet dial $PEERID_0 corenet-test /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log && + ipfsi 1 corenet dial $PEERID_0 corenet-test /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log && ma-pipe-unidir --pidFile=client.pid recv /ip4/127.0.0.1/tcp/10102 & go-sleep 500ms && @@ -95,7 +95,7 @@ test_expect_success "Setup: Idle stream" ' test_expect_success "'ipfs corenet streams' succeeds" ' echo "2 /app/corenet-test /ip4/127.0.0.1/tcp/10101 $PEERID_1" > expected - ipfsi 0 exp corenet streams > actual + ipfsi 0 corenet streams > actual ' test_expect_success "'ipfs corenet streams' output looks good" ' @@ -103,23 +103,23 @@ test_expect_success "'ipfs corenet streams' output looks good" ' ' test_expect_success "'ipfs corenet close' closes stream" ' - ipfsi 0 exp corenet close 2 && - ipfsi 0 exp corenet streams > actual && + ipfsi 0 corenet close 2 && + ipfsi 0 corenet streams > actual && [ ! -f listener.pid ] && [ ! -f client.pid ] && test_must_be_empty actual ' test_expect_success "'ipfs corenet close' closes app handler" ' - ipfsi 0 exp corenet close corenet-test && - ipfsi 0 exp corenet ls > actual && + ipfsi 0 corenet close corenet-test && + ipfsi 0 corenet ls > actual && test_must_be_empty actual ' test_expect_success "Setup: Idle stream(2)" ' ma-pipe-unidir --listen --pidFile=listener.pid recv /ip4/127.0.0.1/tcp/10101 & - ipfsi 0 exp corenet listen corenet-test2 /ip4/127.0.0.1/tcp/10101 2>&1 > listener-stdouterr.log && - ipfsi 1 exp corenet dial $PEERID_0 corenet-test2 /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log && + ipfsi 0 corenet listen corenet-test2 /ip4/127.0.0.1/tcp/10101 2>&1 > listener-stdouterr.log && + ipfsi 1 corenet dial $PEERID_0 corenet-test2 /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log && ma-pipe-unidir --pidFile=client.pid recv /ip4/127.0.0.1/tcp/10102 & go-sleep 500ms && @@ -128,16 +128,16 @@ test_expect_success "Setup: Idle stream(2)" ' test_expect_success "'ipfs corenet streams' succeeds(2)" ' echo "3 /app/corenet-test2 /ip4/127.0.0.1/tcp/10101 $PEERID_1" > expected - ipfsi 0 exp corenet streams > actual + ipfsi 0 corenet streams > actual test_cmp expected actual ' test_expect_success "'ipfs corenet close -a' closes streams and app handlers" ' - ipfsi 0 exp corenet close -a && - ipfsi 0 exp corenet streams > actual && + ipfsi 0 corenet close -a && + ipfsi 0 corenet streams > actual && [ ! -f listener.pid ] && [ ! -f client.pid ] && test_must_be_empty actual && - ipfsi 0 exp corenet ls > actual && + ipfsi 0 corenet ls > actual && test_must_be_empty actual '