-4
index.js
-4
index.js
+1
-5
lib/progress.js
+1
-5
lib/progress.js
···
25
25
var prog = -1
26
26
var int = setInterval(function () {
27
27
var p = progress()
28
-
var r = 1, c = 0
28
+
var r = 1
29
29
var tasks = []
30
30
for(var k in p) {
31
31
var _r = rate(p[k])
32
32
if(_r < 1)
33
33
tasks.push(k+':'+percent(_r))
34
34
r = Math.min(_r, r)
35
-
c++
36
35
}
37
36
if(r != prog) {
38
37
prog = r
···
42
41
}, 333)
43
42
int.unref && int.unref()
44
43
}
45
-
46
-
47
-
+2
-5
test/bin.js
+2
-5
test/bin.js
···
27
27
var exited = false
28
28
var count = 0
29
29
function ssbServer(t, argv, opts) {
30
-
count ++
30
+
count++
31
31
exited = false
32
32
opts = opts || {}
33
33
···
133
133
})
134
134
}
135
135
136
-
var c = 0
137
136
;['::1', '::', '127.0.0.1', 'localhost'].forEach(function (host) {
138
137
if(!has_ipv6 && /:/.test(host)) return
139
138
···
193
192
194
193
var remotes = ma.decode(addr)
195
194
console.log('remotes', remotes, addr)
196
-
ws_remotes = remotes.filter(function(a) {
195
+
var ws_remotes = remotes.filter(function(a) {
197
196
return a.find(function(component) {
198
197
return component.name == 'ws'
199
198
})
···
262
261
end()
263
262
})
264
263
})
265
-
266
-
+7
-22
test/caps.js
+7
-22
test/caps.js
···
1
-
2
-
var cont = require('cont')
3
-
var deepEqual = require('deep-equal')
4
-
var tape = require('tape')
5
-
var pull = require('pull-stream')
6
-
var ssbKeys = require('ssb-keys')
7
-
8
-
var u = require('./util')
1
+
var tape = require('tape')
2
+
var ssbKeys = require('ssb-keys')
9
3
10
4
// create 3 servers
11
5
// give them all pub servers (on localhost)
···
28
22
var sign_cap1 = hash('test-sign-cap1')
29
23
var shs_cap1 = hash('test-shs-cap1')
30
24
31
-
var alice, bob, carol
32
25
var dbA = createSsbServer({
33
26
temp: 'server-alice',
34
27
port: 45451, timeout: 1400,
35
-
keys: alice = ssbKeys.generate(),
28
+
keys: ssbKeys.generate(),
36
29
caps: {
37
30
shs: shs_cap1,
38
31
sign: sign_cap1
···
44
37
var dbB = createSsbServer({
45
38
temp: 'server-bob',
46
39
port: 45452, timeout: 1400,
47
-
keys: bob = ssbKeys.generate(),
40
+
keys: ssbKeys.generate(),
48
41
seeds: [dbA.getAddress()],
49
42
level: 'info'
50
43
})
···
53
46
var dbC = createSsbServer({
54
47
temp: 'server-carol',
55
48
port: 45453, timeout: 1400,
56
-
keys: alice = ssbKeys.generate(),
49
+
keys: ssbKeys.generate(),
57
50
caps: {
58
51
shs: shs_cap1,
59
52
sign: sign_cap1
···
61
54
level: 'info'
62
55
})
63
56
64
-
65
57
tape('signatures not accepted if made from different caps', function (t) {
66
-
67
58
68
59
dbA.publish({type: 'test', foo: true}, function (err, msg) {
69
60
if(err) throw err
···
71
62
dbB.add(msg.value, function (err) {
72
63
t.ok(err) //should not be valid in this universe
73
64
t.ok(/invalid/.test(err.message))
74
-
console.log(err.stack)
75
-
t.end()
65
+
// console.log(err.stack)
76
66
67
+
t.end()
77
68
})
78
69
})
79
70
})
···
84
75
console.log(err.stack)
85
76
86
77
t.end()
87
-
88
78
})
89
-
90
79
})
91
80
92
81
tape('cannot connect if different shs caps, default -> custom', function (t) {
···
104
93
t.end()
105
94
})
106
95
})
107
-
108
96
109
97
tape('cleanup', function (t) {
110
98
dbA.close()
···
112
100
dbC.close()
113
101
t.end()
114
102
})
115
-
116
-
117
-
+4
-3
test/multiple-sbots.js
+4
-3
test/multiple-sbots.js
···
3
3
tape('createSsbServer method allows creating multiple servers with the same plugins', function (t) {
4
4
var createSsbServer = require('../').createSsbServer
5
5
6
-
var ssbServer1 = createSsbServer()
6
+
// server1
7
+
createSsbServer()
7
8
.use(require('ssb-replicate'))
8
9
9
-
var ssbServer2 = createSsbServer()
10
+
// server2
11
+
createSsbServer()
10
12
.use(require('ssb-replicate'))
11
13
.use(require('ssb-gossip'))
12
14
13
15
t.pass()
14
16
t.end()
15
17
})
16
-