Skip to content

Commit

Permalink
Merge pull request #126 from bigchaindb/js-crypto-conditions
Browse files Browse the repository at this point in the history
five-bells-conditions -> js-crypto-conditions
  • Loading branch information
Manolo authored Nov 27, 2017
2 parents ad03590 + da4c4a9 commit 1044a01
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"decamelize": "^1.2.0",
"es6-promise": "^4.0.5",
"fetch-ponyfill": "^4.0.0",
"five-bells-condition": "^5.0.1",
"crypto-conditions": "^2.0.1",
"isomorphic-fetch": "^2.2.1",
"js-sha3": "^0.6.1",
"js-utility-belt": "^1.5.0",
Expand Down
2 changes: 1 addition & 1 deletion src/transaction/makeEd25519Condition.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Buffer } from 'buffer'

import base58 from 'bs58'
import cc from 'five-bells-condition'
import cc from 'crypto-conditions'

import ccJsonify from './utils/ccJsonify'

Expand Down
2 changes: 1 addition & 1 deletion src/transaction/makeSha256Condition.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Buffer } from 'buffer'

import cc from 'five-bells-condition'
import cc from 'crypto-conditions'

import ccJsonify from './utils/ccJsonify'

Expand Down
2 changes: 1 addition & 1 deletion src/transaction/makeThresholdCondition.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import cc from 'five-bells-condition'
import cc from 'crypto-conditions'

import ccJsonify from './utils/ccJsonify'

Expand Down
2 changes: 1 addition & 1 deletion src/transaction/signTransaction.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Buffer } from 'buffer'
import base58 from 'bs58'
import cc from 'five-bells-condition'
import cc from 'crypto-conditions'
import clone from 'clone'

import serializeTransactionIntoCanonicalString from './serializeTransactionIntoCanonicalString'
Expand Down
2 changes: 1 addition & 1 deletion src/transaction/utils/ccJsonLoad.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Buffer } from 'buffer'
import base58 from 'bs58'
import cc from 'five-bells-condition'
import cc from 'crypto-conditions'

/**
* @public
Expand Down
2 changes: 1 addition & 1 deletion test/transaction/test_cryptoconditions.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import test from 'ava'
import cc from 'five-bells-condition'
import cc from 'crypto-conditions'
import { Ed25519Keypair, Transaction } from '../../src'


Expand Down

0 comments on commit 1044a01

Please sign in to comment.