Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Http api 1.0 rc changes #39

Merged
merged 15 commits into from
Jun 21, 2017
Merged

Http api 1.0 rc changes #39

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
af49ec1
Adjust HTTP API endpoints and test
Jun 19, 2017
d4ea4d6
CamelCase for path keys
Jun 19, 2017
d8cb13b
Test Connection._req
Jun 19, 2017
9bc0773
Add constants.js
Jun 19, 2017
03c17ef
Add integration tests
Jun 19, 2017
44896b9
serializeTransactionIntoCanonicalString line length
Jun 19, 2017
3fdaf40
Comply to eslint :gun:
Jun 20, 2017
db10937
Add integration test for asset endpoint :diamond:
Jun 20, 2017
8bd602f
Fix and test outputs endpoint
Jun 20, 2017
3671c57
Test list blocks for a transaction id
Jun 21, 2017
1696f7c
Test list transaction for an asset id
Jun 21, 2017
b883e1f
endpoints => endpoint
Jun 21, 2017
c17d614
Dynamically generated keys for /outputs tests + bool fix
Jun 21, 2017
0da90e8
rm ()
Jun 21, 2017
1aa430a
Adjust float interpretation comment
Jun 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/connection/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export default class Connection {
// NOTE: If `spent` is not defined, it must not be included in the
// query parameters.
if (spent !== undefined) {
query.spent = spent
query.spent = spent.toString()
}
return this._req(this.getApiUrls('outputs'), {
query
Expand Down
4 changes: 2 additions & 2 deletions test/connection/test_connection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ test('Get outputs for a public key and spent=false', t => {
conn.listOutputs(publicKey, spent)
t.truthy(conn._req.calledWith(
expectedPath,
{ query: { public_key: publicKey, spent } }
{ query: { public_key: publicKey, spent: 'false' } }
))
})

Expand All @@ -173,7 +173,7 @@ test('Get outputs for a public key and spent=true', t => {
conn.listOutputs(publicKey, spent)
t.truthy(conn._req.calledWith(
expectedPath,
{ query: { public_key: publicKey, spent } }
{ query: { public_key: publicKey, spent: 'true' } }
))
})

Expand Down
87 changes: 40 additions & 47 deletions test/integration/test_integration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,137 +112,130 @@ test('Valid TRANSFER transaction with multiple Ed25519 inputs', t => {

test('Search for spent and unspent outputs of a given public key', t => {
const conn = new Connection(API_PATH)
const carol = new Ed25519Keypair()
const carolCondition = Transaction.makeEd25519Condition(carol.publicKey)
const carolOutput = Transaction.makeOutput(carolCondition)
const trent = new Ed25519Keypair()
const trentCondition = Transaction.makeEd25519Condition(trent.publicKey)
const trentOutput = Transaction.makeOutput(trentCondition)


const createTx = Transaction.makeCreateTransaction(
asset(),
metaData,
[aliceOutput, aliceOutput],
alice.publicKey
[carolOutput, carolOutput],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

who is Carol?

carol.publicKey
)
const createTxSigned = Transaction.signTransaction(
createTx,
alice.privateKey,
alice.privateKey
carol.privateKey,
carol.privateKey
)

// We spent output 1 (of 0, 1)
const transferTx = Transaction.makeTransferTransaction(
createTxSigned,
metaData,
[bobOutput],
[trentOutput],
1
)
const transferTxSigned = Transaction.signTransaction(
transferTx,
alice.privateKey,
carol.privateKey,
)

function byTransactionId(transactionId, ...outputIndices) {
return value => transactionId === value.transaction_id &&
outputIndices.includes(value.output)
}

return conn.postTransaction(createTxSigned)
.then(({ id }) => conn.pollStatusAndFetchTransaction(id))
.then(() => conn.postTransaction(transferTxSigned))
.then(({ id }) => conn.pollStatusAndFetchTransaction(id))
.then(() => conn.listOutputs(alice.publicKey))
.then(() => conn.listOutputs(carol.publicKey))
// now listOutputs should return us outputs 0 and 1 (unfiltered)
.then(outputs => outputs.filter(byTransactionId(
createTxSigned.id,
0,
1
)))
.then(outputs => t.truthy(outputs.length === 2))
})


test('Search for unspent outputs for a given public key', t => {
const conn = new Connection(API_PATH)
const carol = new Ed25519Keypair()
const carolCondition = Transaction.makeEd25519Condition(carol.publicKey)
const carolOutput = Transaction.makeOutput(carolCondition)
const trent = new Ed25519Keypair()
const trentCondition = Transaction.makeEd25519Condition(trent.publicKey)
const trentOutput = Transaction.makeOutput(trentCondition)

const createTx = Transaction.makeCreateTransaction(
asset(),
metaData,
[aliceOutput, aliceOutput, aliceOutput],
alice.publicKey
[carolOutput, carolOutput, carolOutput],
carol.publicKey
)
const createTxSigned = Transaction.signTransaction(
createTx,
alice.privateKey,
alice.privateKey
carol.privateKey,
carol.privateKey
)

// We spent output 1 (of 0, 1, 2)
const transferTx = Transaction.makeTransferTransaction(
createTxSigned,
metaData,
[bobOutput],
[trentOutput],
1
)
const transferTxSigned = Transaction.signTransaction(
transferTx,
alice.privateKey,
carol.privateKey,
)

function byTransactionId(transactionId, ...outputIndices) {
return value => transactionId === value.transaction_id &&
outputIndices.includes(value.output)
}

return conn.postTransaction(createTxSigned)
.then(({ id }) => conn.pollStatusAndFetchTransaction(id))
.then(() => conn.postTransaction(transferTxSigned))
.then(({ id }) => conn.pollStatusAndFetchTransaction(id))
// now listOutputs should return us outputs 0 and 2 (1 is spent)
.then(() => conn.listOutputs(alice.publicKey, false))
.then(outputs => outputs.filter(byTransactionId(
createTxSigned.id,
0,
2
)))
.then(() => conn.listOutputs(carol.publicKey, 'false'))
.then(outputs => t.truthy(outputs.length === 2))
})


test('Search for spent outputs for a given public key', t => {
const conn = new Connection(API_PATH)
const carol = new Ed25519Keypair()
const carolCondition = Transaction.makeEd25519Condition(carol.publicKey)
const carolOutput = Transaction.makeOutput(carolCondition)
const trent = new Ed25519Keypair()
const trentCondition = Transaction.makeEd25519Condition(trent.publicKey)
const trentOutput = Transaction.makeOutput(trentCondition)

const createTx = Transaction.makeCreateTransaction(
asset(),
metaData,
[aliceOutput, aliceOutput, aliceOutput],
alice.publicKey
[carolOutput, carolOutput, carolOutput],
carol.publicKey
)
const createTxSigned = Transaction.signTransaction(
createTx,
alice.privateKey,
alice.privateKey
carol.privateKey,
carol.privateKey
)

// We spent output 1 (of 0, 1, 2)
const transferTx = Transaction.makeTransferTransaction(
createTxSigned,
metaData,
[bobOutput],
[trentOutput],
1
)
const transferTxSigned = Transaction.signTransaction(
transferTx,
alice.privateKey,
carol.privateKey,
)

function byTransactionId(transactionId, ...outputIndices) {
return value => transactionId === value.transaction_id &&
outputIndices.includes(value.output)
}

return conn.postTransaction(createTxSigned)
.then(({ id }) => conn.pollStatusAndFetchTransaction(id))
.then(() => conn.postTransaction(transferTxSigned))
.then(({ id }) => conn.pollStatusAndFetchTransaction(id))
// now listOutputs should only return us output 1 (0 and 2 are unspent)
.then(() => conn.listOutputs(alice.publicKey, true))
.then(outputs => outputs.filter(byTransactionId(createTxSigned.id, 1)))
.then(() => conn.listOutputs(carol.publicKey, true))
.then(outputs => t.truthy(outputs.length === 1))
})

Expand Down