Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity
5745 commits 111 branches 641 tags 30 MiB
Commit graph

386 commits

Author SHA1 Message Date
Lex Berezhny 64e306801d updated wallet to use asyncio 2018-10-16 17:09:21 -04:00
Tomasz Kopeć 9e2e53147e --conf option improvements (#1455) 
* Conf file improvements
* Add test for loading config file
 2018-10-10 13:44:51 -04:00
Lex Berezhny bc8251696e fix cli version test 2018-10-09 11:37:49 -04:00
Lex Berezhny 9d9916548b added channel/signature annotation to all TXOs, support for pagination 2018-10-08 15:02:52 -04:00
Lex Berezhny 22df26eeb6 dewies_to_lbc and lbc_to_dewies 2018-10-03 18:06:22 -04:00
Lex Berezhny 7b9ff3e8b5 updated with torba refactoring and working claim_send_to_address 2018-10-03 12:32:01 -04:00
Jack Robison 2dd0221711
[API] support ssl, add use_https setting 2018-09-26 09:56:26 -04:00
Lex Berezhny ca9ca09a00 wallet unit test fixes 2018-09-26 07:24:25 -04:00
Jack Robison f310bb6825
[API] fix account_unlock, account_decrypt, and account_encrypt commands 2018-09-25 13:10:55 -04:00
Mark Beamer Jr 559afa465a Implemented removal of float usage. Floats converted to int internally. 2018-09-24 01:25:23 -04:00
Lex Berezhny 0abbc20899 fix for cli test 2018-09-03 09:09:28 -04:00
Lex Berezhny 1675cc4580 renamed a bunch of wallet commands and split up the big account command 2018-09-03 09:09:28 -04:00
shyba eab95a6246
DHT fixes from review and an attempt at removing hashing and equals (#1370) 
* use int to_bytes/from_bytes instead of struct
* fix ping queue bug and dht functional tests
* run functional tests on travis
* re-add contact comparison unit test
* dont need __ne__ if its just inverting __eq__ result
 2018-08-24 11:42:35 -04:00
Lex Berezhny 5afd446bb3
fixing wallet unit tests test_ledger.py and test_transactions.py 2018-08-24 11:42:35 -04:00
Lex Berezhny 84c91c480f
fix for unit/wallet/test_accounts.py 2018-08-24 11:42:35 -04:00
Lex Berezhny d1f00255c1
test fixes related to headers 2018-08-24 11:42:35 -04:00
Victor Shyba 04836ea0d9
fixes from review 2018-08-24 11:40:43 -04:00
Victor Shyba 451823f33e
test_misc and test_streamify functionals on py3 2018-08-24 11:40:43 -04:00
Lex Berezhny a204f0d3e6
- replaced old lbryum function with struct.pack, per @BrannonKing review 
- make copy of keys so we can modify the dictionary
 2018-08-24 11:40:43 -04:00
Lex Berezhny 3594c8976d
improved output when migrating certificates 2018-08-24 11:40:43 -04:00
Lex Berezhny 23ede44bff
fix blob downloader test on py3 
not tying lbrynet db to wallet db just yet
 2018-08-24 11:40:43 -04:00
Lex Berezhny 0006a68bf2
fix import in blob downloder tests 2018-08-24 11:40:43 -04:00
Lex Berezhny 0349e68201
moved unit tests into unit test directory 2018-08-24 11:40:43 -04:00
Lex Berezhny d0d5d0340d
unit tests fixed 2018-08-24 11:40:43 -04:00
Lex Berezhny 0badea874d
test_Downloder tests fixed 2018-08-24 11:40:43 -04:00
Lex Berezhny 0dd6193eaa
FakeComponent was missing __lt__ comparison operator and couldnt be put in set() 2018-08-24 11:40:43 -04:00
hackrush a7ef8889dd
Unified CLI, python 3(WIP) (#1330) 
* Added new custom cli class using aiohttp
* Proper error handling in CLI based on RPC error codes(PoC)
* Auth API working
* UnitTests
 2018-08-24 11:40:43 -04:00
Lex Berezhny f41229cb5b
tx.get_claim_id() -> txo.claim_id, claim update works now 
channel_list encodes claim name and also added claim_id
fixed BlobManager foreign key error handling
 2018-08-24 11:40:43 -04:00
Lex Berezhny fcd46629c4
refactored how transactions are created, fixed list addresses command 2018-08-24 11:40:43 -04:00
Lex Berezhny 10b34d6b33
unnecessary list() added during py3 port 
instead of recursive bytes2unicode use a proper JSONEncoder to conver bytes->unicode for json.dumps()
removing excessive isinstance(data, bytes) checks
py3: / -> // and list() around .items() that gets modified in loop
moved lbrynet.undecorated to where its actually used and hopefully we can delete it eventually
removed build/upload_assets.py, travis can do all this now
 2018-08-24 11:40:43 -04:00
Lex Berezhny bc24dbea29
refactoring of DHT tests and fixed encoding bug when dealing with bytearray 2018-08-24 11:40:43 -04:00
Lex Berezhny 2d4bf73632
working on unit tests 2018-08-24 11:40:43 -04:00
Lex Berezhny af2aeaa66b
fixing unit tests 2018-08-24 11:37:53 -04:00
Lex Berezhny 855fd8bf9a
moved test_customLogger.py 2018-08-24 11:37:53 -04:00
Victor Shyba 99be38604a
attempt to fix tests isolation 2018-08-24 11:37:53 -04:00
Lex Berezhny d35d340613
fixing unit tests 
fixing integration tests
skip running functional tests on travis until they are fixed
 2018-08-24 11:37:53 -04:00
Victor Shyba e1314a9d1e
working functional test_contact_rpc + more string bans 2018-08-24 11:37:53 -04:00
Lex Berezhny ba80c0e594
py2(iteritems, itervalues) -> py3(items, values) 2018-08-24 11:37:53 -04:00
Lex Berezhny fbdbcc8070
assertEquals() -> assertEqual() 2018-08-24 11:37:53 -04:00
Lex Berezhny 971252d5d1
undo simplejson commit 2018-08-24 11:37:53 -04:00
hackrush c01716a6c0
Using simplejson and fixed some encodes and decodes 2018-08-24 11:37:53 -04:00
Lex Berezhny 318c369752
made tests into a package again and moved mocks.py back to root tests dir 2018-08-24 11:37:53 -04:00
Victor Shyba 19211d4417
make sure bencoding works for bytes, not strings 2018-08-24 11:37:53 -04:00
Victor Shyba c312d1b3a6
all unit/dht green on py3 2018-08-24 11:37:53 -04:00
Victor Shyba e4ea1ccbfb
test_node green on py3 2018-08-24 11:37:53 -04:00
Victor Shyba 5b35c4e8f0
port dht.distance ~> py3 2018-08-24 11:37:53 -04:00
Victor Shyba 07a12b66e8
port dht.contacts ~> py3 2018-08-24 11:37:53 -04:00
Lex Berezhny a28c9d09c8
- fix and improvements related to the two balance command account_balance and wallet_balance 
- working CommonWorkflowTests integration test
- pylint, unit and integration test fixes
- switch integration tests to use async/await
 2018-08-24 11:37:53 -04:00
Lex Berezhny 9636ca22e7
fixing unit tests 2018-08-24 11:37:53 -04:00
Lex Berezhny 076af7ef43
py3 compatibility updates 2018-08-24 11:37:53 -04:00
Victor Shyba 39d7f2e46e
port cryptblob test to py3 2018-08-24 11:37:53 -04:00
Victor Shyba 036663ae62
adds get_claims_by_ids and fix a test name 2018-08-24 11:37:53 -04:00
Victor Shyba b62321689d
test proofs 2018-08-24 11:37:53 -04:00
Lex Berezhny d81502e191
unit test fixes, balance/utxos filters out claims, abandoning claims 2018-08-24 11:37:53 -04:00
Lex Berezhny 03d2d0e237
fixed import paths as a result of moving the tests 2018-08-24 11:37:53 -04:00
Lex Berezhny 545451a829
moved ./lbry/tests to ./tests 2018-08-24 11:37:53 -04:00
Akinwale Ariwodola 2abe85ba25 moved tests into the lbrynet package 2017-09-28 18:21:26 +01:00
Jack Robison 6cbe86d057
rename is_validated() to get_is_verified() to distinguish from verified property 2017-09-20 14:02:34 -04:00
Jack Robison 8419e1e1d5
change some ValueErrors to IOErrors 2017-09-20 13:59:26 -04:00
Jack Robison 14636a5d38
split up HashBlob.py into lbrynet.blob 2017-09-20 13:59:24 -04:00
Jack Robison 7d6e62eb77
consolidate HashBlob and BlobFile 2017-09-20 13:59:24 -04:00
Kay Kurokawa f816cc1637
add some unit tests for BlobFile.close() 2017-09-20 13:59:23 -04:00
Kay Kurokawa e92321a9c1
have BlobFile.open_for_writing() return the writer instead of write and close functions 2017-09-20 13:59:23 -04:00
Kay Kurokawa 637d1f265b
add unit tests for HashBlob.py classes 2017-09-20 13:59:21 -04:00
Jack Robison c53a189605
remove TempBlob, clean up blob classes, use FBP and BytesIO in BlobFile 2017-09-20 13:59:18 -04:00
Kay Kurokawa e52d707948 fix bug found in test_EncryptedFileCreator.py, need to yield for blob_manager.setup() 2017-09-13 14:16:07 -04:00
Jack Robison 3f42716706
update tests 2017-09-07 14:01:06 -04:00
Jack Robison 5f9509db96
don't use google finance 2017-09-07 13:55:36 -04:00
Kay Kurokawa e2e28338f3 in ConnectionManager, be consistent and initialize conf values in __init__ 2017-08-28 10:46:47 -04:00
Kay Kurokawa a31b6b192f Create an optional way of downloading by head blob first in ConnectionManager 2017-08-28 10:46:47 -04:00
Kay Kurokawa 0639bb9865 add support for should_announce feature 2017-08-28 10:43:57 -04:00
Kay Kurokawa c0a2c6c830 remove blob manager reliance on HashBlob classes 2017-08-28 10:43:57 -04:00
Umpei Kay Kurokawa 690ef15ba1 Merge pull request #756 from lbryio/fix_integer_resolve 
Fix error when resolving an integer
 2017-08-14 22:52:20 -04:00
Umpei Kay Kurokawa 34ed2467f2 Merge pull request #829 from lbryio/fix_abandon 
Expose abandon by txid/nout in Daemon
 2017-08-14 22:51:39 -04:00
Kay Kurokawa b2f0dedefb fix error when resolving true/false/floats and also prevent other keys from being parsed as boolean, int, or float in CLI 2017-08-14 18:33:41 +02:00
Zestyr 0c2d049c90 Fix error when resolving an integer 
Fixes #588
 2017-08-14 12:15:08 -04:00
Alex Grintsvayg 2927f40ccf fix tests 2017-08-09 19:10:12 -04:00
Kay Kurokawa 4e8d8dfc23 Expose abandon by txid/nout in Daemon 2017-08-08 13:55:03 -04:00
Jack Robison 89e7d7a44d
Merge branch 'master' into conf_reflect_options 2017-08-04 15:16:51 -04:00
Kay Kurokawa 9d92fba02e add ability to control re-reflects through config 2017-08-03 23:44:20 -04:00
Jack Robison 7b93073f7b
Merge branch 'master' into remove_tempblobmanager 2017-08-03 22:26:35 -04:00
Kay Kurokawa 30689b09e6 fix tests to not use TempBlobManager and use tempfile to create temporary directories for DiskBlobManager 2017-07-27 13:38:35 -04:00
hackrush ecd602e5fb Added validation for currencies. 
Now while setting currency via API/CLI it is checked that the user has
not entered any currency other that LBC, BTC or USD.

Fixes #778
 2017-07-24 16:38:15 -04:00
Zestyr 3c40957575 Fix unit test 2017-07-17 21:51:01 +02:00
hackrush f7b6a09110 Updated max_key_fee_setting 
Added an option to disable max key fee check.
Did the required docs changes.
 2017-07-14 14:09:30 -04:00
Kay Kurokawa 73927e2b57 improve tests for GetStream 2017-07-05 16:33:02 -04:00
Kay Kurokawa 03db114ba8 fix test_BlobManager race condition 2017-07-04 17:23:56 -04:00
Kay Kurokawa 7fb5b04bb4 add directory encoding test in test_conf 2017-07-03 16:01:28 -04:00
Kay Kurokawa 55c90e0657 make sure DBEncryptedFileMetadataManager closes db connection 2017-07-02 21:58:02 -04:00
Kay Kurokawa 99c2130be7 fix for test_blobmanager 2017-07-02 21:57:54 -04:00
Kay Kurokawa f71696ee50 delete download_directory argument for API command get 2017-06-30 09:39:49 -04:00
Kay Kurokawa 3479c6ea8d add docstring and unit test for CryptBlob.py 2017-06-28 12:13:24 -04:00
Jack Robison 967cc4c63c rename lbrynet.lbrynet_daemon to lbrynet.daemon 2017-06-25 21:25:41 -04:00
Jack Robison eba74b97bd rename lbrynet.lbryfilemanager to lbrynet.file_manager 2017-06-25 21:04:04 -04:00
Jack Robison 1ec3218f18 rename lbrynet.lbryfile to lbrynet.lbry_file 2017-06-25 21:03:37 -04:00
Kay Kurokawa 14b2bb3019 add test for BlobManager 2017-06-23 10:24:27 -04:00
Kay Kurokawa 711c4f3196 Various improvements, fixes, and tests for GetStream class 2017-06-14 15:05:43 -04:00
Jack Robison 9c88f820f9 add change_address param to publish 2017-06-12 13:43:15 -04:00
Jack Robison ea0c6eca32 multi resolve 2017-06-09 14:48:55 -04:00
Kay Kurokawa a577f38d80 add claim address as an option to publish API command 2017-06-04 19:26:28 -04:00
Kay Kurokawa c3f61b3e69 improve tests for ExchangeRateManager 2017-06-02 11:52:57 -04:00
Jack Robison 9f87d502c3 update currency conversion 2017-06-02 11:52:51 -04:00
Jack Robison 96927ec985 remove lbrynet.metadata 2017-06-02 11:50:50 -04:00
Jack Robison 57c3d2590c update arg parsing to use docopt 2017-05-30 17:43:59 -04:00
Alex Grintsvayg 2353dbcb00 refactor analytics 2017-04-26 14:19:03 -04:00
Alex Grintsvayg e19e2f3609 stop checking github for new versions 2017-04-26 14:18:30 -04:00
Jack Robison e6f92a2dc7 fix fee tests, whitespace 2017-04-12 17:43:00 -04:00
Jack Robison 389ee2ad70 fix stream_cost_estimate 2017-04-11 01:13:10 -04:00
Jack Robison a87834bacc skip test_parallel_connections 2017-04-10 14:21:46 -04:00
Jack Robison 40374ec202 use lbryio api for price data instead of bittrex 2017-04-07 19:33:13 -04:00
Jack Robison e9cfbea75f update lbrynet api and tests 2017-04-07 14:04:13 -04:00
Alex Grin bf7882d393 Merge pull request #583 from lbryio/keyerror_fix 
fix KeyError bug in dht
 2017-04-06 16:09:39 -04:00
Kay Kurokawa 931038d478 bug fixes for lbryschema integration 2017-04-04 20:30:51 -04:00
Kay Kurokawa ca041b5dc4 lbryschema integration 2017-04-04 20:30:51 -04:00
Alex Grintsvayg 22f57f6490 add test to reproduce keyerror 2017-04-04 15:10:46 -04:00
Kay Kurokawa 3af5e9dc5c connect to multiple peers at once in manage 2017-03-27 15:11:15 -04:00
Alex Grintsvayg 8fa2524e54 properly handle true/false cli args 2017-03-23 17:44:12 -04:00
Alex Grintsvayg 3f4a4728e6 fixed my silly mistakes 2017-03-09 07:58:36 -05:00
Umpei Kay Kurokawa da99f3f22b Merge pull request #493 from lbryio/filemanager_related_tests 
Filemanager related unit tests
 2017-03-08 11:53:46 -05:00
Alex Grintsvayg 68f5588bd9 make loggly logs less verbose 2017-03-08 11:23:28 -05:00
Kay Kurokawa f600038712 work on unit tests for file management related classes 2017-03-08 09:15:06 -05:00
Kay Kurokawa eae8f8a00e add random_lbry_hash() function to tests.util 2017-03-08 09:15:06 -05:00
Kay Kurokawa 9755e9b11f Improvements to exchange rate manager 2017-03-03 12:50:47 -05:00
Kay Kurokawa 7128b6401e adding missing __init__.py file in test folder 2017-02-27 13:10:23 -05:00
Kay Kurokawa 824fbcc25a adding timeout to ClientProtocol 2017-02-27 13:02:35 -05:00
Job Evers‐Meltzer 04b36e2252 Merge pull request #486 from lbryio/electron 
Electron
 2017-02-21 13:19:55 -06:00
Alex Grintsvayg 2add545ab6 unbreak tests 2017-02-21 13:48:05 -05:00
jobevers 1d30ae447a Merge branch 'master' into electron 2017-02-21 10:47:28 -06:00
jobevers ff5980dfca fix broken version check 2017-02-21 09:36:08 -06:00
Kay Kurokawa 3522f9af7d use utils.call_later in DHTHash Announcer 2017-02-20 16:48:29 -05:00
Kay Kurokawa c27fe7af31 use utils.call_later in ConnectionManager 2017-02-20 16:48:29 -05:00
jobevers 723105157f check lbry-electron for releases 2017-02-16 14:18:32 -06:00
jobevers 85390302e2 still more fixes 2017-02-16 14:13:01 -06:00
Job Evers-Meltzer e2db99f7ab allow requests that match allowed-origin 2017-02-16 11:44:23 -05:00
Kay Kurokawa 34f5bc93ae adding immediate announce option to hash announce 2017-02-13 17:27:10 -05:00
Kay Kurokawa aa45b0e121 Fixes for other tests now that BlobManager relies on DHTHashAnnouncer.get_next_announce_time() 2017-02-13 17:27:10 -05:00
Kay Kurokawa 8e0f71ac74 Make hash reannounce time adjusted based on the queue of hashes yet to be announced, add test for DHTHashAnnouncer 2017-02-13 17:27:10 -05:00
Kay Kurokawa 4f87e87d3e Adding connection manager tests, and modifying connection manager to be testeable, fix bug where failed connection was not marked as down 2017-02-13 12:17:27 -05:00
Kay Kurokawa a5e8c561e4 Revert "adding connection manager tests, and modifying connection manager to be testeable" 
This reverts commit 7b6e233d22, as it was an accidental push to master
 2017-02-01 11:59:36 -05:00
Kay Kurokawa 7b6e233d22 adding connection manager tests, and modifying connection manager to be testeable 2017-02-01 11:52:16 -05:00
Alex Grintsvayg 86ba7ffd5c explicitly list jsonrpc params in function signature. add jsonrpc tests 2017-01-30 09:58:28 -08:00
Kay Kurokawa eebf32362a add unit tests for wallet interface changes to balances 2017-01-26 11:41:39 -05:00
Alex Grintsvayg cac8267e85 updates, more refactoring for greater clarity 2017-01-17 12:29:09 -05:00
Alex Grintsvayg 267c6cbaca refactor conf.settings 2017-01-16 22:32:54 -05:00
Job Evers-Meltzer 3bb8f4ac21 set ui_version for bundled ui 2017-01-02 12:01:55 -06:00
Job Evers-Meltzer 669a567545 add id to link download events 2016-12-30 13:35:16 -06:00
Job Evers-Meltzer 20b6b22334 Add callback functionality to log.fail 
This enables the common pattern of being able to log a failure and
then do something.
 2016-12-15 18:58:15 -06:00
Job Evers-Meltzer b8c91c61bb Make a new logger with a fail method that is useful for errbacks. 
Extracting useful tracebacks and line numbers from failures
withing twisted's deferred can be a pain. Hopefully this is a step
in the right direction.
 2016-12-15 18:58:15 -06:00
Job Evers-Meltzer c30ea04959 Remove commented code 
This is the result of running eradicate (https://github.com/myint/eradicate)
on the code and double-checking the changes.
 2016-12-15 18:58:06 -06:00
Kay Kurokawa fe4ea9b33a use assertFailure, move around assertEqual arguments to standard locations 2016-12-14 19:05:24 -06:00
Kay Kurokawa c278972f26 adding unit tests for Wallet.py 2016-12-14 19:05:23 -06:00
Jack 948be0f040 clean up tests 2016-12-05 11:48:44 -05:00
Jack b9bb337a07 add tests for daemon.get_est_cost 2016-12-05 11:48:44 -05:00
Jack Robison 13d74d1f76 Merge pull request #297 from lbryio/better-name-error 
Provide better feedback on why a name is invalid
 2016-12-02 12:08:58 -05:00
Job Evers-Meltzer 2bf098b5a3 add tests for settings change 2016-12-01 15:22:53 -05:00
Job Evers-Meltzer f39a21cf7b Provide better feedback on why a name is invalid 2016-12-01 11:02:37 -06:00
Job Evers‐Meltzer f11f486f5a Merge pull request #292 from lbryio/allow-rc 
allow for rc in version values
 2016-11-30 14:16:17 -06:00
Job Evers-Meltzer 6a8789050c Allow 0.0.0.0 for api interface 
For a host to be able to access the daemon running inside a docker
container the damon needs to be listening to 0.0.0.0

- move the API_INTERFACE setting to the adjustablesettings
- check the port matches as well as the interface
 2016-11-28 19:19:05 -06:00
Jack 543f65fc24 fail verify_name_characters for blank name 2016-11-21 21:58:04 -05:00
Job Evers-Meltzer 3d7dee1208 allow for rc in version values 2016-11-19 16:58:40 -06:00
Job Evers-Meltzer f3a71245e8 Add missing files 
Somehow these files got lost in a rebase. I'm sort of at a loss
for how, but well, adding them back in.
 2016-11-09 11:35:03 -06:00
Job Evers-Meltzer d06c670a12 Allow publishing with unicode filenames 
encodes unicode into a string before hashing.  Also adds tests
to verify that the fix works and that normal files
can be made into EncryptedFiles
 2016-11-04 11:44:50 -05:00
Job Evers‐Meltzer 572f1d1f6e Merge pull request #200 from lbryio/cleanup-tests 
Start to cleanup functional tests to improve readability
 2016-10-24 11:01:20 -05:00
Job Evers‐Meltzer 27a8114b6f Merge pull request #197 from lbryio/add-dht-tests 
Rename DHT tests such that trial automatically runs them
 2016-10-24 11:00:40 -05:00
Job Evers-Meltzer 229ed0d7dc rename summarize to summarize_and_reset 2016-10-20 11:29:58 -07:00
Job Evers-Meltzer 813267ae18 fix tests 2016-10-20 11:29:58 -07:00
Job Evers-Meltzer 3a91896d8a track the amount of data uploaded 2016-10-20 11:28:05 -07:00
Job Evers-Meltzer 3f727d892c refactor events; add tests 2016-10-20 11:28:05 -07:00
Job Evers-Meltzer c104ed3f8b better time handling in tests 2016-10-20 11:28:05 -07:00
Job Evers-Meltzer bfcfa9dc3c cleanup tests to improve readability 2016-10-20 09:30:08 -07:00
Job Evers-Meltzer a5d3c0bbe1 rename tests such that trial automatically runs them 2016-10-19 16:38:59 -05:00
Alex Liebowitz b5a3929bb5 Fix imports 2016-10-14 16:41:02 -04:00
Alex Liebowitz 9cf1d6b710 Tests for new JSON Schema system 2016-10-14 10:37:18 -04:00
Jack 99c060719a clean up test_strategy 2016-10-13 14:00:46 -04:00
Jack d9cd215a60 set seed for strategy tests 2016-10-13 13:48:18 -04:00
Jack 19c2264429 clean up 2016-10-13 13:35:55 -04:00
Jack 4f60a98eb2 fix functional tests, add a few unit tests, 
-add ‘generous’ parameter for NegotiatedPaymentRateManager to turn free
hosting on/off, by default set to true.
 2016-10-05 22:58:34 -04:00
Jack 967700dc28 BlobRequestHandler and Strategy tests 2016-10-03 02:44:58 -04:00
Jack d741c705cd add some tests, don't use lighthouse for cost ests 2016-10-01 01:09:27 -04:00
Job Evers-Meltzer 1e4b5cb450 rename test files 2016-09-27 11:18:52 -07:00
Job Evers-Meltzer a9da6e4bdf run sed on tests too 2016-09-27 11:18:52 -07:00
Jack add163a092 move get_params to own function, add some tests 2016-09-15 22:20:00 -04:00
Jack 80837cb040 Merge branch 'master' into content_type 
fix conflicts:
	lbrynet/lbrynet_daemon/LBRYPublisher.py
 2016-08-25 17:59:20 -04:00
Jack cc1b3609a1 Merge branch 'master' into reflector 
# Conflicts:
#	lbrynet/__init__.py
 2016-08-17 19:01:38 -04:00
Job Evers-Meltzer 35481a92f5 actually cleanup patched time.time 2016-08-10 19:36:52 -05:00
Job Evers-Meltzer d172d43ddf add reflector functional test to travis 2016-08-10 08:29:44 -05:00