Commit Graph

12210 Commits

Author SHA1 Message Date
Anton Evangelatov
6720463799 resolve merge conflicts 2021-06-22 11:28:23 +02:00
Raúl Kripalani
bb032b526c switch back to ws API. 2021-06-21 23:24:59 +01:00
Raúl Kripalani
0e2d06fc39 switch to http API. 2021-06-21 23:10:17 +01:00
Raúl Kripalani
502e104e6a typo. 2021-06-21 21:35:39 +01:00
Raúl Kripalani
e438ef99f8 fix merge error in window post dispute tests. 2021-06-21 21:25:55 +01:00
Raúl Kripalani
e69335b35f Merge branch 'master' into raulk/itests-refactor-kit 2021-06-21 21:21:05 +01:00
Raúl Kripalani
4fcd0b7aca disable resource filtering on scheduler. 2021-06-21 21:20:45 +01:00
Łukasz Magiera
6e1cf6fdc9
Merge pull request #6542 from filecoin-project/raulk/worker-disable-resource-filtering
extern/storage: add ability to ignore worker resources when scheduling.
2021-06-21 22:11:14 +02:00
Raúl Kripalani
b7a5e3cd0f Merge branch 'raulk/worker-disable-resource-filtering' into raulk/itests-refactor-kit 2021-06-21 21:09:04 +01:00
Raúl Kripalani
c0a8a9f5b5 make gen. 2021-06-21 20:52:59 +01:00
Raúl Kripalani
684cce198f add a unit test. 2021-06-21 20:49:24 +01:00
Raúl Kripalani
59eab2df25 move scheduling filtering logic down. 2021-06-21 20:49:16 +01:00
Raúl Kripalani
83839362c5 fix boolean condition. 2021-06-21 20:35:51 +01:00
Raúl Kripalani
b6147fb27f extern/storage: retype resource filtering strategy to enum. 2021-06-21 20:28:15 +01:00
Raúl Kripalani
f3b6f8de1a add ability to ignore worker resources when scheduling. 2021-06-21 20:08:18 +01:00
Raúl Kripalani
c22e10c4a4 use mock proofs in TestQuotePriceForUnsealedRetrieval. 2021-06-21 18:29:25 +01:00
Raúl Kripalani
132b49728c Merge branch 'master' into raulk/itests-refactor-kit 2021-06-21 18:26:04 +01:00
Raúl Kripalani
70929a99e6 speed up test. 2021-06-21 18:24:39 +01:00
Raúl Kripalani
00fa3878d4 remove debug statement. 2021-06-21 18:22:08 +01:00
Raúl Kripalani
0879ac496f uncomment lines in TestDealCyclesConcurrent. 2021-06-21 18:21:10 +01:00
Raúl Kripalani
83ee345b1c Merge branch 'master' into raulk/itests-refactor-kit 2021-06-21 18:19:26 +01:00
Łukasz Magiera
fa2b247f75
Merge pull request #6540 from filecoin-project/chore/merge-1.10
Merge 1.10 branch into master
2021-06-21 17:19:51 +02:00
Łukasz Magiera
b37a66c7c9 Merge remote-tracking branch 'origin/release/v1.10.0' into chore/merge-1.10 2021-06-21 17:03:03 +02:00
Raúl Kripalani
d1b291de5e fix proof types. 2021-06-21 13:24:25 +01:00
Łukasz Magiera
ae65e6595d
Merge pull request #6498 from rjan90/patch-2
Initial draft: basic build instructions on Readme
2021-06-21 12:58:04 +02:00
Raúl Kripalani
7ee184e965 fix lotus-storage-miner tests. 2021-06-21 11:56:10 +01:00
Jennifer
a641a03908 Merge pull request #6529 from filecoin-project/jen/rc6
version bump to lotus v1.10.0-rc6
2021-06-18 22:59:34 -04:00
Jennifer Wang
e1c2567136 docs gen 2021-06-18 22:20:13 -04:00
Jennifer Wang
b01189467a version bump to lotus v1.10.0-rc6 2021-06-18 22:05:19 -04:00
Jennifer
fd15080ead
Merge pull request #6528 from filecoin-project/ntwk/calibration-reset
Upgrade epochs for calibration reset
2021-06-18 22:00:08 -04:00
Travis Person
c11a32cf69 Add calibration genesis 2021-06-19 00:53:21 +00:00
Travis Person
65844761b6 Calibration network reset 2021-06-18 23:55:01 +00:00
Raúl Kripalani
8a418bf982 rename {kit2=>kit}. 2021-06-18 19:45:29 +01:00
Raúl Kripalani
a7d8d15c13 kill old kit 🎉 2021-06-18 19:42:06 +01:00
raulk
a8bf7e7bad
Merge pull request #6510 from filecoin-project/refactor/itest-wdpost-dispute 2021-06-18 19:40:12 +01:00
raulk
83de21e464
Merge pull request #6483 from filecoin-project/refactor/itest-multisig 2021-06-18 19:39:24 +01:00
Raúl Kripalani
718babd33a use miner owner address when posting proofs. 2021-06-18 19:38:17 +01:00
Raúl Kripalani
9604be6d2f Merge branch 'raulk/itests-refactor-kit' into refactor/itest-wdpost-dispute 2021-06-18 19:29:18 +01:00
Raúl Kripalani
3d8eb374bd cleaner instantiation of lite and gateway nodes + general cleanup. 2021-06-18 19:23:42 +01:00
Łukasz Magiera
e7fa8589da
Merge pull request #6526 from filecoin-project/fix/reorgch-deadlock
chainstore: Don't take heaviestLk with backlogged reorgCh
2021-06-18 20:18:58 +02:00
Raúl Kripalani
3ae42d4648 Merge branch 'raulk/itests-refactor-kit' into refactor/itest-multisig 2021-06-18 19:08:07 +01:00
raulk
7c329d43f2
Merge pull request #6511 from filecoin-project/refactor/itest-deadling-toggling 2021-06-18 18:29:11 +01:00
Łukasz Magiera
2c2c37a138 chainstore: Don't take heaviestLk with backlogged reorgCh 2021-06-18 19:18:51 +02:00
Raúl Kripalani
5548541e1a fix default proof type to use for non-genesis miners.
We need to instantiate non-genesis miners with a _concrete_
proof type.
2021-06-18 18:10:42 +01:00
Anton Evangelatov
577b730415 wip 2021-06-18 18:42:34 +02:00
Raúl Kripalani
4c2cc8e5f7 Merge branch 'raulk/itests-refactor-kit' into refactor/itest-deadling-toggling 2021-06-18 16:20:15 +01:00
Raúl Kripalani
e85af3cba7 fix merge error. 2021-06-18 16:19:58 +01:00
Łukasz Magiera
085cabcda8
Merge pull request #6524 from filecoin-project/feat/proofs-v8.0.2
Update to proofs v8.0.2 with correct aggregate lengths
2021-06-18 17:15:56 +02:00
Łukasz Magiera
738ac926d1 Update ffi 2021-06-18 16:27:37 +02:00
Raúl Kripalani
32327c7d43 Merge branch 'raulk/itests-refactor-kit' into refactor/itest-deadling-toggling 2021-06-18 11:22:12 +01:00