Skip to content

Commit 4f3f1b5

Browse files
committed
Merge branch 'master' of https://github.com/TSavo/Link.git
Conflicts: src/linkPublishTest.coffee src/linkPublisher.coffee
2 parents 0acd5c7 + 97e8773 commit 4f3f1b5

File tree

5 files changed

+22
-24
lines changed

5 files changed

+22
-24
lines changed

.project

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<projectDescription>
3-
<name>Link</name>
4-
<comment></comment>
5-
<projects>
6-
</projects>
7-
<buildSpec>
8-
</buildSpec>
9-
<natures>
10-
</natures>
11-
</projectDescription>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>Link</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
</buildSpec>
9+
<natures>
10+
</natures>
11+
</projectDescription>

lib/linkPublishTest.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/linkPublisher.js

Lines changed: 3 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/linkPublishTest.coffee

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ client = new bitcoin.Client
66
port: 8332
77
user: 'Kevlar'
88
pass: 'zabbas'
9-
version: 14
9+
client.version=14
1010

11-
rl = readline.createInterface(
11+
rl = readline.createInterface
1212
input: process.stdin
1313
output: process.stdout
14-
)
14+
1515
rl.question "Payload: ", (magnet) ->
1616
rl.question "Name: ", (name) ->
1717
rl.question "Keywords: ", (keywords) ->
18-
publisher = new LinkPublisher(client)
18+
publisher = new LinkPublisher client
1919
publisher.publish
2020
payloadInline:magnet
2121
name:name
2222
keywords:keywords
2323
, console.log
24-
rl.close()
24+
rl.close()

src/linkPublisher.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class LinkPublisher
44
constructor:(client)->
55
@client = client
66
publish: (message, callback) ->
7-
sequence = new LinkSequenceBuilder(@client.opts.version)
7+
sequence = new LinkSequenceBuilder(@client.version)
88
sequence.addPayloadInline message.payloadInline if message.payloadInline?
99
sequence.addName message.name if message.name?
1010
sequence.addKeywords message.keywords if message.keywords?
@@ -30,4 +30,4 @@ class LinkPublisher
3030
client.sendRawTransaction decoded.hex, (error, result) ->
3131
callback(result) if callback?
3232

33-
exports.LinkPublisher = LinkPublisher
33+
exports.LinkPublisher = LinkPublisher

0 commit comments

Comments
 (0)