Corenet API: Drop 'exp' namespace
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
May 30, 2017 at 17:47 UTC
71bda3d98830aac7f4206d2877f18fd8faf1b64b
3 files changed
+19
-34
core/commands/experimental.go
deleted
-15
@@ -1,15 +0,0 @@
1
-package commands
2
-
3
-import (
4
- cmds "github.com/ipfs/go-ipfs/commands"
5
-)
6
-
7
-var ExpCmd = &cmds.Command{
8
- Helptext: cmds.HelpText{
9
- Tagline: "Experimental commands",
10
- ShortDescription: `'ipfs exp' groups experimental features that are subject to change or removal at any time.`,
11
- },
12
- Subcommands: map[string]*cmds.Command{
13
- "corenet": CorenetCmd,
14
- },
15
-}
core/commands/root.go
+1
-1
@@ -99,11 +99,11 @@ var rootSubcommands = map[string]*cmds.Command{
99
"cat": CatCmd,
100
"commands": CommandsDaemonCmd,
101
"config": ConfigCmd,
102
+ "corenet": CorenetCmd,
103
"dag": dag.DagCmd,
104
"dht": DhtCmd,
105
"diag": DiagCmd,
106
"dns": DNSCmd,
106
- "exp": ExpCmd,
107
"files": files.FilesCmd,
108
"get": GetCmd,
109
"id": IDCmd,
test/sharness/t0180-corenet.sh
+18
-18
@@ -36,14 +36,14 @@ test_expect_success "enable filestore config setting" '
36
'
37
38
test_expect_success 'start corenet listener' '
39
- ipfsi 0 exp corenet listen corenet-test /ip4/127.0.0.1/tcp/10101 2>&1 > listener-stdouterr.log
39
+ ipfsi 0 corenet listen corenet-test /ip4/127.0.0.1/tcp/10101 2>&1 > listener-stdouterr.log
40
'
41
42
test_expect_success 'Test server to client communications' '
43
ma-pipe-unidir --listen send /ip4/127.0.0.1/tcp/10101 < corenet0.bin &
44
SERVER_PID=$!
45
46
- ipfsi 1 exp corenet dial $PEERID_0 corenet-test /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log &&
46
+ ipfsi 1 corenet dial $PEERID_0 corenet-test /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log &&
47
ma-pipe-unidir recv /ip4/127.0.0.1/tcp/10102 > client.out &&
48
wait $SERVER_PID
49
'
@@ -52,7 +52,7 @@ test_expect_success 'Test client to server communications' '
52
ma-pipe-unidir --listen recv /ip4/127.0.0.1/tcp/10101 > server.out &
53
SERVER_PID=$!
54
55
- ipfsi 1 exp corenet dial $PEERID_0 corenet-test /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log &&
55
+ ipfsi 1 corenet dial $PEERID_0 corenet-test /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log &&
56
ma-pipe-unidir send /ip4/127.0.0.1/tcp/10102 < corenet1.bin
57
wait $SERVER_PID
58
'
@@ -67,7 +67,7 @@ test_expect_success 'client to server output looks good' '
67
68
test_expect_success "'ipfs corenet ls' succeeds" '
69
echo "/ip4/127.0.0.1/tcp/10101 /app/corenet-test" > expected &&
70
- ipfsi 0 exp corenet ls > actual
70
+ ipfsi 0 corenet ls > actual
71
'
72
73
test_expect_success "'ipfs corenet ls' output looks good" '
@@ -75,18 +75,18 @@ test_expect_success "'ipfs corenet ls' output looks good" '
75
'
76
77
test_expect_success "Cannot re-register app handler" '
78
- (! ipfsi 0 exp corenet listen corenet-test /ip4/127.0.0.1/tcp/10101)
78
+ (! ipfsi 0 corenet listen corenet-test /ip4/127.0.0.1/tcp/10101)
79
'
80
81
test_expect_success "'ipfs corenet streams' output is empty" '
82
- ipfsi 0 exp corenet streams > actual &&
82
+ ipfsi 0 corenet streams > actual &&
83
test_must_be_empty actual
84
'
85
86
test_expect_success "Setup: Idle stream" '
87
ma-pipe-unidir --listen --pidFile=listener.pid recv /ip4/127.0.0.1/tcp/10101 &
88
89
- ipfsi 1 exp corenet dial $PEERID_0 corenet-test /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log &&
89
+ ipfsi 1 corenet dial $PEERID_0 corenet-test /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log &&
90
ma-pipe-unidir --pidFile=client.pid recv /ip4/127.0.0.1/tcp/10102 &
91
92
go-sleep 500ms &&
@@ -95,7 +95,7 @@ test_expect_success "Setup: Idle stream" '
95
96
test_expect_success "'ipfs corenet streams' succeeds" '
97
echo "2 /app/corenet-test /ip4/127.0.0.1/tcp/10101 $PEERID_1" > expected
98
- ipfsi 0 exp corenet streams > actual
98
+ ipfsi 0 corenet streams > actual
99
'
100
101
test_expect_success "'ipfs corenet streams' output looks good" '
@@ -103,23 +103,23 @@ test_expect_success "'ipfs corenet streams' output looks good" '
103
'
104
105
test_expect_success "'ipfs corenet close' closes stream" '
106
- ipfsi 0 exp corenet close 2 &&
107
- ipfsi 0 exp corenet streams > actual &&
106
+ ipfsi 0 corenet close 2 &&
107
+ ipfsi 0 corenet streams > actual &&
108
[ ! -f listener.pid ] && [ ! -f client.pid ] &&
109
test_must_be_empty actual
110
'
111
112
test_expect_success "'ipfs corenet close' closes app handler" '
113
- ipfsi 0 exp corenet close corenet-test &&
114
- ipfsi 0 exp corenet ls > actual &&
113
+ ipfsi 0 corenet close corenet-test &&
114
+ ipfsi 0 corenet ls > actual &&
115
test_must_be_empty actual
116
'
117
118
test_expect_success "Setup: Idle stream(2)" '
119
ma-pipe-unidir --listen --pidFile=listener.pid recv /ip4/127.0.0.1/tcp/10101 &
120
121
- ipfsi 0 exp corenet listen corenet-test2 /ip4/127.0.0.1/tcp/10101 2>&1 > listener-stdouterr.log &&
122
- ipfsi 1 exp corenet dial $PEERID_0 corenet-test2 /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log &&
121
+ ipfsi 0 corenet listen corenet-test2 /ip4/127.0.0.1/tcp/10101 2>&1 > listener-stdouterr.log &&
122
+ ipfsi 1 corenet dial $PEERID_0 corenet-test2 /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log &&
123
ma-pipe-unidir --pidFile=client.pid recv /ip4/127.0.0.1/tcp/10102 &
124
125
go-sleep 500ms &&
@@ -128,16 +128,16 @@ test_expect_success "Setup: Idle stream(2)" '
128
129
test_expect_success "'ipfs corenet streams' succeeds(2)" '
130
echo "3 /app/corenet-test2 /ip4/127.0.0.1/tcp/10101 $PEERID_1" > expected
131
- ipfsi 0 exp corenet streams > actual
131
+ ipfsi 0 corenet streams > actual
132
test_cmp expected actual
133
'
134
135
test_expect_success "'ipfs corenet close -a' closes streams and app handlers" '
136
- ipfsi 0 exp corenet close -a &&
137
- ipfsi 0 exp corenet streams > actual &&
136
+ ipfsi 0 corenet close -a &&
137
+ ipfsi 0 corenet streams > actual &&
138
[ ! -f listener.pid ] && [ ! -f client.pid ] &&
139
test_must_be_empty actual &&
140
- ipfsi 0 exp corenet ls > actual &&
140
+ ipfsi 0 corenet ls > actual &&
141
test_must_be_empty actual
142
'
143