Merge pull request filecoin-project#2 from EntropyPool/ntwk-calibrati…

…on-entropypool-8.19.1

Ntwk calibration entropypool 8.19.1

.circleci/config.yml

@@ -5,7 +5,7 @@ orbs:
 executors:
   golang:
     docker:
-      - image: circleci/golang:1.14.2
+      - image: circleci/golang:1.14.6
     resource_class: 2xlarge
   ubuntu:
     docker:
@@ -93,10 +93,10 @@ jobs:
       - store_artifacts:
           path: lotus
       - store_artifacts:
-          path: lotus-storage-miner
+          path: lotus-miner
       - store_artifacts:
-          path: lotus-seal-worker
-      - run: mkdir linux && mv lotus lotus-storage-miner lotus-seal-worker linux/
+          path: lotus-worker
+      - run: mkdir linux && mv lotus lotus-miner lotus-worker linux/
       - persist_to_workspace:
           root: "."
           paths:
@@ -134,7 +134,7 @@ jobs:
         description: Test suite name to report to CircleCI.
       gotestsum-format:
         type: string
-        default: short
+        default: pkgname-and-test-fails
         description: gotestsum format. https://github.com/gotestyourself/gotestsum#format
       coverage:
         type: string
@@ -156,21 +156,27 @@ jobs:
       - download-params
       - go/install-gotestsum:
           gobin: $HOME/.local/bin
+          version: 0.5.2
       - run:
           name: go test
           environment:
-            GOTESTSUM_JUNITFILE: /tmp/test-reports/<< parameters.test-suite-name >>/junit.xml
-            GOTESTSUM_FORMAT: << parameters.gotestsum-format >>
             LOTUS_TEST_WINDOW_POST: << parameters.winpost-test >>
           command: |
             mkdir -p /tmp/test-reports/<< parameters.test-suite-name >>
-            gotestsum -- \
+            mkdir -p /tmp/test-artifacts
+            gotestsum \
+              --format << parameters.gotestsum-format >> \
+              --junitfile /tmp/test-reports/<< parameters.test-suite-name >>/junit.xml \
+              --jsonfile /tmp/test-artifacts/<< parameters.test-suite-name >>.json \
+              -- \
               << parameters.coverage >> \
               << parameters.go-test-flags >> \
               << parameters.packages >>
           no_output_timeout: 30m
       - store_test_results:
           path: /tmp/test-reports
+      - store_artifacts:
+          path: /tmp/test-artifacts/<< parameters.test-suite-name >>.json
       - when:
           condition: << parameters.codecov-upload >>
           steps:
@@ -223,10 +229,10 @@ jobs:
       - store_artifacts:
           path: lotus
       - store_artifacts:
-          path: lotus-storage-miner
+          path: lotus-miner
       - store_artifacts:
-          path: lotus-seal-worker
-      - run: mkdir darwin && mv lotus lotus-storage-miner lotus-seal-worker darwin/
+          path: lotus-worker
+      - run: mkdir darwin && mv lotus lotus-miner lotus-worker darwin/
       - persist_to_workspace:
           root: "."
           paths:
@@ -314,16 +320,19 @@ workflows:
   ci:
     jobs:
       - lint-changes:
-          args: "--new-from-rev origin/master"
+          args: "--new-from-rev origin/next"
       - mod-tidy-check
       - gofmt
       - test:
           codecov-upload: true
+          test-suite-name: full
       - test-window-post:
           go-test-flags: "-run=TestWindowedPost"
           winpost-test: "1"
+          test-suite-name: window-post
       - test-short:
           go-test-flags: "--timeout 10m --short"
+          test-suite-name: short
           filters:
             tags:
               only:

.github/ISSUE_TEMPLATE/sealingfailed.md

@@ -17,18 +17,27 @@ A brief description of the problem you encountered while proving (sealing) a sec
 
 Including what commands you ran, and a description of your setup, is very helpful.
 
-**Sectors list**
+**Sectors status**
 
-The output of `./lotus-storage-miner sectors list`.
+The output of `lotus-miner sectors status --log <sectorId>` for the failed sector(s).
 
-**Sectors status**
+**Lotus miner logs**
+
+Please go through the logs of your miner, and include screenshots of any error-like messages you find.
+
+Alternatively please upload full log files and share a link here
+
+**Lotus miner diagnostic info**
+
+Please collect the following diagnostic information, and share a link here
 
-The output of `./lotus-storage-miner sectors status --log <sectorId>` for the failed sector(s).
+* lotus-miner diagnostic info `lotus-miner info all > allinfo`
 
-**Lotus storage miner logs**
+** Code modifications **
 
-Please go through the logs of your storage miner, and include screenshots of any error-like messages you find.
+If you have modified parts of lotus, please describe which areas were modified,
+and the scope of those modifications
 
 **Version**
 
-The output of `./lotus --version`.
+The output of `lotus --version`.

.gitignore

@@ -1,19 +1,21 @@
 /lotus
-/lotus-storage-miner
-/lotus-seal-worker
+/lotus-miner
+/lotus-worker
 /lotus-seed
 /lotus-health
+/lotus-chainwatch
 /lotus-shed
-/pond
-/townhall
-/fountain
-/stats
-/bench
+/lotus-pond
+/lotus-townhall
+/lotus-fountain
+/lotus-stats
+/lotus-bench
 /bench.json
 /lotuspond/front/node_modules
 /lotuspond/front/build
 /cmd/lotus-townhall/townhall/node_modules
 /cmd/lotus-townhall/townhall/build
+/cmd/lotus-townhall/townhall/package-lock.json
 extern/filecoin-ffi/rust/target
 **/*.a
 **/*.pc
@@ -24,7 +26,6 @@ build/paramfetch.sh
 /vendor
 /blocks.dot
 /blocks.svg
-/chainwatch
 /chainwatch.db
 /bundle
 /darwin

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "extern/filecoin-ffi"]
 	path = extern/filecoin-ffi
-	url = https://github.com/filecoin-project/filecoin-ffi.git
-	branch = master
+	url = https://github.com/EntropyPool/filecoin-ffi.git
+	branch = entropypool-777a6fbf
 [submodule "extern/serialization-vectors"]
 	path = extern/serialization-vectors
 	url = https://github.com/filecoin-project/serialization-vectors