update Dockerfiles; integrate lotus-soup and graphsync in Lotus CI; update go.mod and references

.circleci/config.yml

@@ -264,22 +264,44 @@ jobs:
           path: /tmp/test-artifacts/conformance-coverage.html
   build-lotus-soup:
     description: |
-      Compile `lotus-soup` Testground test plan using the current version of Lotus.
+      Compile `lotus-soup` Testground test plan
     parameters:
       <<: *test-params
     executor: << parameters.executor >>
     steps:
       - install-deps
       - prepare
-      - run: cd extern/oni && git submodule sync
-      - run: cd extern/oni && git submodule update --init
       - run: cd extern/filecoin-ffi && make
-      - run:
-          name: "replace lotus, filecoin-ffi, blst and fil-blst deps"
-          command: cd extern/oni/lotus-soup && go mod edit -replace github.com/filecoin-project/lotus=../../../ && go mod edit -replace github.com/filecoin-project/filecoin-ffi=../../filecoin-ffi && go mod edit -replace github.com/supranational/blst=../../blst
       - run:
           name: "build lotus-soup testplan"
-          command: pushd extern/oni/lotus-soup && go build -tags=testground .
+          command: pushd testplans/lotus-soup && go build -tags=testground .
+  trigger-testplans:
+    description: |
+      Trigger `lotus-soup` test cases on TaaS
+    parameters:
+      <<: *test-params
+    executor: << parameters.executor >>
+    steps:
+      - install-deps
+      - prepare
+      - run:
+          name: "download testground"
+          command: wget https://gist.github.com/nonsense/5fbf3167cac79945f658771aed32fc44/raw/2e17eb0debf7ec6bdf027c1bdafc2c92dd97273b/testground-d3e9603 -O ~/testground-cli && chmod +x ~/testground-cli
+      - run:
+          name: "prepare .env.toml"
+          command: pushd testplans/lotus-soup && mkdir -p $HOME/testground && cp env-ci.toml $HOME/testground/.env.toml && echo 'endpoint="https://ci.testground.ipfs.team"' >> $HOME/testground/.env.toml && echo 'user="circleci"' >> $HOME/testground/.env.toml
+      - run:
+          name: "prepare testground home dir"
+          command: mkdir -p $HOME/testground/plans && mv testplans/lotus-soup testplans/graphsync $HOME/testground/plans/
+      - run:
+          name: "trigger deals baseline testplan on taas"
+          command: ~/testground-cli run composition -f $HOME/testground/plans/lotus-soup/_compositions/baseline-k8s-3-1.toml --metadata-commit=$CIRCLE_SHA1 --metadata-repo=filecoin-project/lotus --metadata-branch=$CIRCLE_BRANCH
+      - run:
+          name: "trigger payment channel stress testplan on taas"
+          command: ~/testground-cli run composition -f $HOME/testground/plans/lotus-soup/_compositions/paych-stress-k8s.toml --metadata-commit=$CIRCLE_SHA1 --metadata-repo=filecoin-project/lotus --metadata-branch=$CIRCLE_BRANCH
+      - run:
+          name: "trigger graphsync testplan on taas"
+          command: ~/testground-cli run composition -f $HOME/testground/plans/graphsync/_compositions/stress-k8s.toml --metadata-commit=$CIRCLE_SHA1 --metadata-repo=filecoin-project/lotus --metadata-branch=$CIRCLE_BRANCH
 
 
   build-macos:
@@ -472,6 +494,7 @@ workflows:
           packages: "./conformance"
           vectors-branch: master
       - build-lotus-soup
+      - trigger-testplans
       - build-debug
       - build-all:
           requires:

testplans/.circleci/config.yml

@@ -1,86 +0,0 @@
----
-version: 2.1
-
-parameters:
-  workspace-dir:
-    type: string
-    default: "/home/circleci"
-
-commands:
-  setup:
-    description: "install go, checkout and restore cache"
-    steps:
-      - checkout
-      - run: sudo apt-get update
-      - run: sudo apt-get install ocl-icd-opencl-dev
-      - run: git submodule sync
-      - run: git submodule update --init
-      - run: cd extra/filecoin-ffi && make
-
-executors:
-  golang:
-    docker:
-      - image: circleci/golang:1.14.6
-    resource_class: 2xlarge
-
-workflows:
-  version: 2
-  main:
-    jobs:
-      - build-soup-linux
-      - build-graphsync-linux
-      - trigger-testplans
-  nightly:
-    triggers:
-      - schedule:
-          cron: "45 * * * *"
-          filters:
-            branches:
-              only:
-                - master
-    jobs:
-      - trigger-testplans
-
-jobs:
-
-  build-soup-linux:
-    executor: golang
-    steps:
-      - setup
-      - run:
-          name: "build lotus-soup"
-          command: pushd lotus-soup && go build -tags=testground .
-
-  build-graphsync-linux:
-    executor: golang
-    steps:
-      - setup
-      - run:
-          name: "build graphsync"
-          command: pushd graphsync && go build .
-
-  trigger-testplans:
-    executor: golang
-    steps:
-      - setup
-      - run:
-          name: "download testground"
-          command: wget https://gist.github.com/nonsense/5fbf3167cac79945f658771aed32fc44/raw/2e17eb0debf7ec6bdf027c1bdafc2c92dd97273b/testground-d3e9603 -O ~/testground-cli && chmod +x ~/testground-cli
-      - run:
-          name: "prepare .env.toml"
-          command: pushd lotus-soup && mkdir -p $HOME/testground && cp env-ci.toml $HOME/testground/.env.toml && echo 'endpoint="'$endpoint'"' >> $HOME/testground/.env.toml && echo 'token="'$token'"' >> $HOME/testground/.env.toml && echo 'user="circleci"' >> $HOME/testground/.env.toml
-      - run:
-          name: "prepare testground home dir"
-          command: mkdir -p $HOME/testground/plans && mv lotus-soup $HOME/testground/plans/ && mv graphsync $HOME/testground/plans/
-      - run:
-          name: "trigger baseline test plan on testground ci"
-          command: ~/testground-cli run composition -f $HOME/testground/plans/lotus-soup/_compositions/baseline-k8s-3-1.toml --metadata-commit=$CIRCLE_SHA1 --metadata-repo=filecoin-project/oni --metadata-branch=$CIRCLE_BRANCH
-      - run:
-          name: "trigger payment channel stress test plan on testground ci"
-          command: ~/testground-cli run composition -f $HOME/testground/plans/lotus-soup/_compositions/paych-stress-k8s.toml --metadata-commit=$CIRCLE_SHA1 --metadata-repo=filecoin-project/oni --metadata-branch=$CIRCLE_BRANCH
-      - run:
-          name: "trigger deals stress concurrent test plan on testground ci"
-          command: ~/testground-cli run composition -f $HOME/testground/plans/lotus-soup/_compositions/deals-stress-concurrent-natural-k8s.toml --metadata-commit=$CIRCLE_SHA1 --metadata-repo=filecoin-project/oni --metadata-branch=$CIRCLE_BRANCH
-      - run:
-          name: "trigger graphsync stress test plan on testground ci"
-          command: ~/testground-cli run composition -f $HOME/testground/plans/graphsync/_compositions/stress-k8s.toml --metadata-commit=$CIRCLE_SHA1 --metadata-repo=filecoin-project/oni --metadata-branch=$CIRCLE_BRANCH

testplans/.github/ISSUE_TEMPLATE/test-scenario-request.md

@@ -1,28 +0,0 @@
----
-name: 👯‍♀️ Test scenario
-about: Suggest a test scenario for Project Oni to consider
-title: "[test scenario] "
-labels: hint/needs-analysis, hint/needs-triage, kind/test-scenario
-
----
-
-**Describe the test scenario.**
-
-<!-- A clear and concise description of what the test scenario looks like, e.g. I'd like you to test that/if/how [...] -->
-
-**Provide any background and technical implementation details.**
-
-<!-- Provide any info and technical insight that would help us implement such scenario. Think about the setup, choreography between nodes, operations involved, etc. -->
-
-**What should we measure?**
-
-<!-- Indicate what we should be measuring for comparison/analytical purposes. -->
-
-**Discomfort factor (0-10).**
-
-<!-- How uncomfortable would you be if we launched mainnet without our Oni tests covering this system process / test scenario? --> 
-<!-- Rubric in https://github.com/filecoin-project/oni/labels?q=discomfort. -->
-
-**Additional remarks.**
-
-<!-- Anything else that Project Oni should know. -->

testplans/.github/labels.yml

@@ -1,277 +0,0 @@
-## Color palette
-
-# yellows:  dba355 d8a038 d8bd36 edd17d fbca04
-# greens:   92ef92 6bbf3b 1cef5c 75b72d 9fea8f c6e84e c1f45a b8d613 fcf0b5 
-# reds:     dd362a
-# blues:    5b91c6 2a7d93 0bb1ed
-# pinks:    bf0f73 c619b5
-# oranges:  ba500e ce8048
-# teals:    40c491
-#
-# Tailwind CSS colors: https://tailwindcss.com/docs/customizing-colors/
-
-###
-### Special magic GitHub labels
-###
-- description: "Good for newcomers"
-  name: "good first issue"
-  color: 7057ff
-- description: "Extra attention is needed"
-  name: "help wanted"
-  color: 008672
-
-## Work streams
-- description: "Workstream: End-to-end Tests"
-  name: "workstream/e2e-tests"
-  color: fbca04
-- description: "Workstream: VM Conformance Tests"
-  name: "workstream/vm-conformance-tests"
-  color: fbca04
-
-###
-### Topics
-###
-- description: "Topic: Slashing"
-  name: topic/slashing
-  color: c619b5
-- description: "Topic: Sector proving"
-  name: topic/sector-proving
-  color: c619b5
-- description: "Topic: Sync / fork selection"
-  name: topic/sync-forks
-  color: c619b5
-- description: "Topic: Present-time mining / tipset assembly"
-  name: topic/mining-present
-  color: c619b5
-- description: "Topic: Catch-up / rush mining"
-  name: topic/mining-rush
-  color: c619b5
-- description: "Topic: Payment channels"
-  name: topic/paych
-  color: c619b5
-- description: "Topic: Drand faults"
-  name: topic/drand
-  color: c619b5
-- description: "Topic: Mempool message selection"
-  name: topic/mempool
-  color: c619b5
-- description: "Topic: Presealing"
-  name: topic/presealing
-  color: c619b5
-- description: "Topic: Deals"
-  name: topic/deals
-  color: c619b5
-
-###
-### Kinds
-###
-- description: "Kind: Bug"
-  name: kind/bug
-  color: c92712
-- description: "Kind: Problem"
-  name: kind/problem
-  color: c92712
-- description: "Kind: Investigation"
-  name: kind/investigation
-  color: fcf0b5
-- description: "Kind: Chore"
-  name: kind/chore
-  color: fcf0b5
-- description: "Kind: Feature"
-  name: kind/feature
-  color: fcf0b5
-- description: "Kind: Improvement"
-  name: kind/improvement
-  color: fcf0b5
-- description: "Kind: Test Scenario"
-  name: kind/test-scenario
-  color: feb95e
-- description: "Kind: Tracking Issue"
-  name: kind/tracking-issue
-  color: fcf0b5
-- description: "Kind: Question"
-  name: kind/question
-  color: fcf0b5
-- description: "Kind: Enhancement"
-  name: kind/enhancement
-  color: fcf0b5
-- description: "Kind: Discussion"
-  name: kind/discussion
-  color: fcf0b5
-- description: "Kind: Spike"
-  name: kind/spike
-  color: fcf0b5
-- description: "Kind: System Process"
-  name: kind/system-process
-  color: ff4782
-
-###
-### Difficulties
-###
-- description: "Difficulty: Trivial"
-  name: dif/trivial
-  color: b2b7ff
-- description: "Difficulty: Easy"
-  name: dif/easy
-  color: 7886d7
-- description: "Difficulty: Medium"
-  name: dif/medium
-  color: 6574cd
-- description: "Difficulty: Hard"
-  name: dif/hard
-  color: 5661b3
-- description: "Difficulty: Expert"
-  name: dif/expert
-  color: 2f365f
-
-###
-### Efforts
-###
-- description: "Effort: Minutes"
-  name: effort/minutes
-  color: e8fffe
-- description: "Effort: One or Multiple Hours."
-  name: effort/hours
-  color: a0f0ed
-- description: "Effort: One Day."
-  name: effort/day
-  color: 64d5ca
-- description: "Effort: Multiple Days."
-  name: effort/days
-  color: 4dc0b5
-- description: "Effort: One Week."
-  name: effort/week
-  color: 38a89d
-- description: "Effort: Multiple Weeks."
-  name: effort/weeks
-  color: 20504f
-
-###
-### Discomfort Factor
-###
-- description: "Discomfort factor: I wake up in the middle of the night with nightmares, sweats, and chills."
-  name: discomfort-factor/10
-  color: c53030
-- description: "Discomfort factor: Wakes me up in the middle of the night, but if I breathe deep, I can sleep again."
-  name: discomfort-factor/9
-  color: e53e3e
-- description: "Discomfort factor: I touched my eyes after picking up a Jalapeño (10,000 SHU)."
-  name: discomfort-factor/8
-  color: f56565
-- description: "Discomfort factor: Sitting next to a sweaty gentleman in a transatlantic flight."
-  name: discomfort-factor/7
-  color: dd6b20
-- description: "Discomfort factor: Agonizing smalltalk."
-  name: discomfort-factor/6
-  color: ed8936
-- description: "Discomfort factor: Watching tourists wear white socks with flip-flops."
-  name: discomfort-factor/5
-  color: f6ad55
-- description: "Discomfort factor: An itchy jumper label the entire night."
-  name: discomfort-factor/4
-  color: ecc94b
-- description: "Discomfort factor: A pebble in my shoe."
-  name: discomfort-factor/3
-  color: f6e05e
-- description: "Discomfort factor: A sneeze that just won't come out."
-  name: discomfort-factor/2
-  color: faf089
-- description: "Discomfort factor: Opening a can with a supposedly 'easy open lid' whose ring has snapped."
-  name: discomfort-factor/1
-  color: c6f6d5
-- description: "Discomfort factor: Don't worry, chill, we're cool!"
-  name: discomfort-factor/0
-  color: f0fff4
-  
-###
-### Priorities
-###
-- description: "P0: Critical. This is a blocker. Drop everything else."
-  name: P0
-  color: dd362a
-- description: "P1: Must be fixed."
-  name: P1
-  color: ce8048
-- description: "P2: Should be fixed."
-  name: P2
-  color: dbd81a
-- description: "P3: Might get fixed."
-  name: P3
-  color: 9fea8f
-
-###
-### Hints
-###
-- description: "Hint: Good First Issue"
-  name: hint/good-first-issue
-  color: 0623cc
-- description: "Hint: Needs Contributor"
-  name: hint/needs-contributor
-  color: 0623cc
-- description: "Hint: Needs Scoring"
-  name: hint/needs-scoring
-  color: 0623cc
-- description: "Hint: Needs Decision"
-  name: hint/needs-decision
-  color: 0623cc
-- description: "Hint: Needs Triage"
-  name: hint/needs-triage
-  color: 0623cc
-- description: "Hint: Needs Analysis"
-  name: hint/needs-analysis
-  color: 0623cc
-- description: "Hint: Needs Author Input"
-  name: hint/needs-author-input
-  color: 0623cc
-- description: "Hint: Needs Team Input"
-  name: hint/needs-team-input
-  color: 0623cc
-- description: "Hint: Needs Community Input"
-  name: hint/needs-community-input
-  color: 0623cc
-- description: "Hint: Needs Review"
-  name: hint/needs-review
-  color: 0623cc
-- description: "Hint: Needs Help"
-  name: hint/needs-help
-  color: 0623cc
-- description: "Hint: Description outdated"
-  name: hint/desc-outdated
-  color: 0623cc
-
-###
-### Statuses
-###
-- description: "Status: Done"
-  name: status/done
-  color: edb3a6
-- description: "Status: Approved and Awaiting Merge"
-  name: status/approved-waiting
-  color: edb3a6
-- description: "Status: Changes Requested in Review"
-  name: status/changes-requested
-  color: edb3a6
-- description: "Status: Waiting for Review"
-  name: status/awaiting-review
-  color: edb3a6
-- description: "Status: Deferred"
-  name: status/deferred
-  color: edb3a6
-- description: "Status: In Progress"
-  name: status/in-progress
-  color: edb3a6
-- description: "Status: Blocked"
-  name: status/blocked
-  color: edb3a6
-- description: "Status: Inactive"
-  name: status/inactive
-  color: edb3a6
-- description: "Status: Waiting"
-  name: status/waiting
-  color: edb3a6
-- description: "Status: Rotten"
-  name: status/rotten
-  color: edb3a6
-- description: "Status: Discarded / Won't fix"
-  name: status/discarded
-  color: a0aec0

testplans/.github/workflows/label-syncer.yml

@@ -1,16 +0,0 @@
-name: Label syncer
-on:
-  push:
-    paths:
-      - '.github/labels.yml'
-    branches:
-      - master
-jobs:
-  build:
-    name: Sync labels
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@1.0.0
-      - uses: micnncim/action-label-syncer@v0.4.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

testplans/.gitignore

@@ -1,4 +0,0 @@
-venv/
-__pycache__/
-.ipynb_checkpoints/
-tvx/tvx

testplans/.gitmodules

@@ -1,6 +0,0 @@
-[submodule "extra/filecoin-ffi"]
-	path = extra/filecoin-ffi
-	url = https://github.com/filecoin-project/filecoin-ffi.git
-[submodule "extra/fil-blst"]
-	path = extra/fil-blst
-	url = https://github.com/filecoin-project/fil-blst.git

testplans/Makefile

@@ -6,18 +6,15 @@ download-proofs:
 	go run github.com/filecoin-project/go-paramfetch/paramfetch 2048 ./docker-images/proof-parameters.json
 
 build-images:
-	docker build -t "iptestground/oni-buildbase:v8" -f "docker-images/Dockerfile.oni-buildbase" "docker-images"
+	docker build -t "iptestground/oni-buildbase:v11-lotus" -f "docker-images/Dockerfile.oni-buildbase" "docker-images"
-	docker build -t "iptestground/oni-runtime:v3" -f "docker-images/Dockerfile.oni-runtime" "docker-images"
+	docker build -t "iptestground/oni-runtime:v5" -f "docker-images/Dockerfile.oni-runtime" "docker-images"
-	docker build -t "iptestground/oni-runtime:v4-debug" -f "docker-images/Dockerfile.oni-runtime-debug" "docker-images"
 
 push-images:
-	docker push iptestground/oni-buildbase:v9
+	docker push iptestground/oni-buildbase:v11-lotus
-	docker push iptestground/oni-runtime:v3
+	docker push iptestground/oni-runtime:v5
-	docker push iptestground/oni-runtime:v4-debug
 
 pull-images:
-	docker pull iptestground/oni-buildbase:v9
+	docker pull iptestground/oni-buildbase:v11-lotus
-	docker pull iptestground/oni-runtime:v3
+	docker pull iptestground/oni-runtime:v5
-	docker pull iptestground/oni-runtime:v4-debug
 
 .PHONY: download-proofs build-images push-images pull-images

testplans/README-old-from-oni.md

@@ -0,0 +1,254 @@
+# Project Oni 👹
+
+Our mandate is:
+
+> To verify the successful end-to-end outcome of the filecoin protocol and filecoin implementations, under a variety of real-world and simulated scenarios. 
+
+➡️  Find out more about our goals, requirements, execution plan, and team culture, in our [Project Description](https://docs.google.com/document/d/16jYL--EWYpJhxT9bakYq7ZBGLQ9SB940Wd1lTDOAbNE).
+
+## Table of Contents
+
+- [Testing topics](#testing-topics)
+- [Repository contents](#repository-contents)
+- [Running the test cases](#running-the-test-cases)
+- [Catalog](#catalog)
+- [Debugging](#debugging)
+- [Dependencies](#dependencies)
+- [Docker images changelog](#docker-images-changelog)
+- [Team](#team)
+
+## Testing topics
+
+These are the topics we are currently centering our testing efforts on. Our testing efforts include fault induction, stress tests, and end-to-end testing.
+
+* **slashing:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fslashing)
+    * We are recreating the scenarios that lead to slashing, as they are not readily seen in mono-client testnets.
+    * Context: slashing is the negative economic consequence of penalising a miner that has breached protocol by deducing FIL and/or removing their power from the network.
+* **windowed PoSt/sector proving faults:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fsector-proving)
+    * We are recreating the proving fault scenarios and triggering them in an accelerated fasion (by modifying the system configuration), so that we're able to verify that the sector state transitions properly through the different milestones (temporary faults, termination, etc.), and under chain fork conditions.
+    * Context: every 24 hours there are 36 windows where miners need to submit their proofs of sector liveness, correctness, and validity. Failure to do so will mark a sector as faulted, and will eventually terminate the sector, triggering slashing consequences for the miner.
+* **syncing/fork selection:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fsync-forks)
+    * Newly bootstrapped clients, and paused-then-resumed clients, are able to latch on to the correct chain even in the presence of a large number of forks in the network, either in the present, or throughout history.
+* **present-time mining/tipset assembly:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fmining-present)
+    * Induce forks in the network, create network partitions, simulate chain halts, long-range forks, etc. Stage many kinds of convoluted chain shapes, and network partitions, and ensure that miners are always able to arrive to consensus when disruptions subside.
+* **catch-up/rush mining:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fmining-rush)
+    * Induce network-wide, or partition-wide arrests, and investigate what the resulting chain is after the system is allowed to recover.
+    * Context: catch-up/rush mining is a dedicated pathway in the mining logic that brings the chain up to speed with present time, in order to recover from network halts. Basically it entails producing backdated blocks in a hot loop. Imagine all miners recover in unison from a network-wide disruption; miners will produce blocks for their winning rounds, and will label losing rounds as _null rounds_. In the current implementation, there is no time for block propagation, so miners will produce solo-chains, and the assumption is that when all these chains hit the network, the _fork choice rule_ will pick the heaviest one. Unfortunately this process is brittle and unbalanced, as it favours the miner that held the highest power before the disruption commenced.
+* **storage and retrieval deals:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fdeals)
+    * end-to-end flows where clients store and retrieve pieces from miners, including stress testing the system.
+* **payment channels:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fpaych)
+    * stress testing payment channels via excessive lane creation, excessive payment voucher atomisation, and redemption.
+* **drand incidents and impact on the filecoin network/protocol/chain:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fdrand)
+    * drand total unavailabilities, drand catch-ups, drand slowness, etc.
+* **mempool message selection:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fmempool)
+    * soundness of message selection logic; potentially targeted attacks against miners by flooding their message pools with different kinds of messages.
+* **presealing:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fpresealing)
+    * TBD, anything related to this worth testing?
+
+## Repository contents
+
+This repository consists of [test plans](https://docs.testground.ai/concepts-and-architecture/test-structure) built to be run on [Testground](https://github.com/testground/testground).
+
+The source code for the various test cases can be found in the [`lotus-soup` directory](https://github.com/filecoin-project/oni/tree/master/lotus-soup).
+
+## Running the test cases
+
+If you are unfamiliar with Testground, we strongly suggest you read the Testground [Getting Started guide](https://docs.testground.ai/getting-started) in order to learn how to install Testground and how to use it.
+
+You can find various [composition files](https://docs.testground.ai/running-test-plans#composition-runs) describing various test scenarios built as part of Project Oni at [`lotus-soup/_compositions` directory](https://github.com/filecoin-project/oni/tree/master/lotus-soup/_compositions).
+
+We've designed the test cases so that you can run them via the `local:exec`, `local:docker` and the `cluster:k8s` runners. Note that Lotus miners are quite resource intensive, requiring gigabytes of memory. Hence you would have to run these test cases on a beafy machine (when using `local:docker` and `local:exec`), or on a Kubernetes cluster (when using `cluster:k8s`).
+
+Here are the basics of how to run the baseline deals end-to-end test case:
+
+### Running the baseline deals end-to-end test case
+
+1. Compile and Install Testground from source code.
+    * See the [Getting Started](https://github.com/testground/testground#getting-started) section of the README for instructions.
+
+2. Run a Testground daemon
+
+```
+testground daemon
+```
+
+3. Download required Docker images for the `lotus-soup` test plan
+
+```
+make pull-images
+```
+
+Alternatively you can build them locally with
+
+```
+make build-images
+```
+
+4. Import the `lotus-soup` test plan into your Testground home directory
+
+```
+testground plan import --from ./lotus-soup
+```
+
+5. Init the `filecoin-ffi` Git submodule in the `extra` folder.
+
+```
+git submodule update --init --recursive
+```
+
+6. Compile the `filecoin-ffi` version locally (necessary if you use `local:exec`)
+
+```
+cd extra/filecoin-ffi
+make
+```
+
+7. Run a composition for the baseline deals end-to-end test case
+
+```
+testground run composition -f ./lotus-soup/_compositions/baseline-docker-5-1.toml
+```
+
+## Batch-running randomised test cases
+
+The Oni testkit supports [range parameters](https://github.com/filecoin-project/oni/blob/master/lotus-soup/testkit/testenv_ranges.go),
+which test cases can use to generate random values, either at the instance level
+(each instance computes a random value within range), or at the run level (one
+instance computes the values, and propagates them to all other instances via the
+sync service).
+
+For example:
+
+```toml
+latency_range   = '["20ms", "500ms"]'
+loss_range      = '[0, 0.2]'
+```
+
+Could pick a random latency between 20ms and 500ms, and a packet loss
+probability between 0 and 0.2. We could apply those values through the
+`netclient.ConfigureNetwork` Testground SDK API.
+
+Randomized range-based parameters are specially interesting when combined with
+batch runs, as it enables Monte Carlo approaches to testing.
+
+The Oni codebase includes a batch test run driver in package `lotus-soup/runner`.
+You can point it at a composition file that uses range parameters and tell it to
+run N iterations of the test:
+
+```shell script
+$ go run ./runner -runs 5 _compositions/net-chaos/latency.toml
+```
+
+This will run the test as many times as instructed, and will place all outputs
+in a temporary directory. You can pass a concrete output directory with
+the `-output` flag. 
+
+## Catalog
+
+### Test cases part of `lotus-soup`
+
+* `deals-e2e` - Deals end-to-end test case. Clients pick a miner at random, start a deal, wait for it to be sealed, and try to retrieve from another random miner who offers back the data.
+* `drand-halting` - Test case that instructs Drand with a sequence of halt/resume/wait events, while running deals between clients and miners at the same time.
+* `deals-stress` - Deals stress test case. Clients pick a miner and send multiple deals (concurrently or serially) in order to test how many deals miners can handle.
+* `paych-stress` - A test case exercising various payment channel stress tests.
+
+### Compositions part of `lotus-soup`
+
+* `baseline-docker-5-1.toml` - Runs a `baseline` test (deals e2e test) with a network of 5 clients and 1 miner targeting `local:docker`
+* `baseline-k8s-10-3.toml` - Runs a `baseline` test (deals e2e test) with a network of 10 clients and 3 miner targeting `cluster:k8s`
+* `baseline-k8s-3-1.toml` - Runs a `baseline` test (deals e2e test) with a network of 3 clients and 1 miner targeting `cluster:k8s`
+* `baseline-k8s-3-2.toml` - Runs a `baseline` test (deals e2e test) with a network of 3 clients and 2 miner targeting `cluster:k8s`
+* `baseline.toml` - Runs a `baseline` test (deals e2e test) with a network of 3 clients and 2 miner targeting `local:exec`. You have to manually download the proof parameters and place them in `/var/tmp`.
+* `deals-stress-concurrent-natural-k8s.toml`
+* `deals-stress-concurrent-natural.toml`
+* `deals-stress-concurrent.toml`
+* `deals-stress-serial-natural.toml`
+* `deals-stress-serial.toml`
+* `drand-halt.toml`
+* `local-drand.toml`
+* `natural.toml`
+* `paych-stress.toml`
+* `pubsub-tracer.toml`
+
+
+## Debugging
+
+Find commands and how-to guides on debugging test plans at [DELVING.md](https://github.com/filecoin-project/oni/blob/master/DELVING.md)
+
+1. Querying the Lotus RPC API
+
+2. Useful commands / checks
+
+* Making sure miners are on the same chain
+
+* Checking deals
+
+* Sector queries
+
+* Sector sealing errors
+
+## Dependencies
+
+Our current test plan `lotus-soup` is building programatically the Lotus filecoin implementation and therefore requires all it's dependencies. The build process is slightly more complicated than a normal Go project, because we are binding a bit of Rust code. Lotus codebase is in Go, however its `proofs` and `crypto` libraries are in Rust (BLS signatures, SNARK verification, etc.).
+
+Depending on the runner you want to use to run the test plan, these dependencies are included in the build process in a different way, which you should be aware of should you require to use the test plan with a newer version of Lotus:
+
+### Filecoin FFI libraries
+
+* `local:docker`
+
+The Rust libraries are included in the Filecoin FFI Git submodule, which is part of the `iptestground/oni-buildbase` image. If the FFI changes on Lotus, we have to rebuild this image with the `make build-images` command, where X is the next version (see [Docker images changelog](#docker-images-changelog)
+below).
+
+* `local:exec`
+
+The Rust libraries are included via the `extra` directory. Make sure that the test plan reference to Lotus in `go.mod` and the `extra` directory are pointing to the same commit of the FFI git submodule. You also need to compile the `extra/filecoin-ffi` libraries with `make`.
+
+* `cluster:k8s`
+
+The same process as for `local:docker`, however you need to make sure that the respective `iptestground/oni-buildbase` image is available as a public Docker image, so that the Kubernetes cluster can download it.
+
+### proof parameters
+
+Additional to the Filecoin FFI Git submodules, we are also bundling `proof parameters` in the `iptestground/oni-runtime` image. If these change, you will need to rebuild that image with `make build-images` command, where X is the next version.
+
+## Docker images changelog
+
+### oni-buildbase
+
+* `v1` => initial image locking in Filecoin FFI commit ca281af0b6c00314382a75ae869e5cb22c83655b.
+* `v2` => no changes; released only for aligning both images to aesthetically please @nonsense :D
+* `v3` => locking in Filecoin FFI commit 5342c7c97d1a1df4650629d14f2823d52889edd9.
+* `v4` => locking in Filecoin FFI commit 6a143e06f923f3a4f544c7a652e8b4df420a3d28.
+* `v5` => locking in Filecoin FFI commit cddc56607e1d851ea6d09d49404bd7db70cb3c2e.
+* `v6` => locking in Filecoin FFI commit 40569104603407c999d6c9e4c3f1228cbd4d0e5c.
+* `v7` => add Filecoin-BLST repo to buildbase.
+* `v8` => locking in Filecoin FFI commit f640612a1a1f7a2d.
+* `v9` => locking in Filecoin FFI commit 57e38efe4943f09d3127dcf6f0edd614e6acf68e and Filecoin-BLST commit 8609119cf4595d1741139c24378fcd8bc4f1c475.
+
+
+### oni-runtime
+
+* `v1` => initial image with 2048 parameters.
+* `v2` => adds auxiliary tools: `net-tools netcat traceroute iputils-ping wget vim curl telnet iproute2 dnsutils`.
+* `v3` => bump proof parameters from v27 to v28
+
+### oni-runtime-debug
+
+* `v1` => initial image
+* `v2` => locking in Lotus commit e21ea53
+* `v3` => locking in Lotus commit d557c40
+* `v4` => bump proof parameters from v27 to v28
+* `v5` => locking in Lotus commit 1a170e18a
+
+
+## Team
+
+* [@raulk](https://github.com/raulk) (Captain + TL)
+* [@nonsense](https://github.com/nonsense) (Testground TG + engineer)
+* [@yusefnapora](https://github.com/yusefnapora) (engineer and technical writer)
+* [@vyzo](https://github.com/vyzo) (engineer)
+* [@schomatis](https://github.com/schomatis) (advisor)
+* [@willscott](https://github.com/willscott) (engineer)
+* [@alanshaw](https://github.com/alanshaw) (engineer)
+

testplans/README.md

@@ -1,55 +1,18 @@
-# Project Oni 👹
+# Testground testplans for Lotus
 
-Our mandate is:
+This directory consists of [testplans](https://docs.testground.ai/concepts-and-architecture/test-structure) built to be run on [Testground](https://github.com/testground/testground) that exercise Lotus on [TaaS](https://ci.testground.ipfs.team).
-
-> To verify the successful end-to-end outcome of the filecoin protocol and filecoin implementations, under a variety of real-world and simulated scenarios. 
-
-➡️  Find out more about our goals, requirements, execution plan, and team culture, in our [Project Description](https://docs.google.com/document/d/16jYL--EWYpJhxT9bakYq7ZBGLQ9SB940Wd1lTDOAbNE).
 
 ## Table of Contents
 
 - [Testing topics](#testing-topics)
-- [Repository contents](#repository-contents)
 - [Running the test cases](#running-the-test-cases)
-- [Catalog](#catalog)
-- [Debugging](#debugging)
-- [Dependencies](#dependencies)
-- [Docker images changelog](#docker-images-changelog)
-- [Team](#team)
 
 ## Testing topics
 
-These are the topics we are currently centering our testing efforts on. Our testing efforts include fault induction, stress tests, and end-to-end testing.
+* **storage and retrieval deals:**
-
-* **slashing:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fslashing)
-    * We are recreating the scenarios that lead to slashing, as they are not readily seen in mono-client testnets.
-    * Context: slashing is the negative economic consequence of penalising a miner that has breached protocol by deducing FIL and/or removing their power from the network.
-* **windowed PoSt/sector proving faults:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fsector-proving)
-    * We are recreating the proving fault scenarios and triggering them in an accelerated fasion (by modifying the system configuration), so that we're able to verify that the sector state transitions properly through the different milestones (temporary faults, termination, etc.), and under chain fork conditions.
-    * Context: every 24 hours there are 36 windows where miners need to submit their proofs of sector liveness, correctness, and validity. Failure to do so will mark a sector as faulted, and will eventually terminate the sector, triggering slashing consequences for the miner.
-* **syncing/fork selection:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fsync-forks)
-    * Newly bootstrapped clients, and paused-then-resumed clients, are able to latch on to the correct chain even in the presence of a large number of forks in the network, either in the present, or throughout history.
-* **present-time mining/tipset assembly:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fmining-present)
-    * Induce forks in the network, create network partitions, simulate chain halts, long-range forks, etc. Stage many kinds of convoluted chain shapes, and network partitions, and ensure that miners are always able to arrive to consensus when disruptions subside.
-* **catch-up/rush mining:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fmining-rush)
-    * Induce network-wide, or partition-wide arrests, and investigate what the resulting chain is after the system is allowed to recover.
-    * Context: catch-up/rush mining is a dedicated pathway in the mining logic that brings the chain up to speed with present time, in order to recover from network halts. Basically it entails producing backdated blocks in a hot loop. Imagine all miners recover in unison from a network-wide disruption; miners will produce blocks for their winning rounds, and will label losing rounds as _null rounds_. In the current implementation, there is no time for block propagation, so miners will produce solo-chains, and the assumption is that when all these chains hit the network, the _fork choice rule_ will pick the heaviest one. Unfortunately this process is brittle and unbalanced, as it favours the miner that held the highest power before the disruption commenced.
-* **storage and retrieval deals:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fdeals)
     * end-to-end flows where clients store and retrieve pieces from miners, including stress testing the system.
-* **payment channels:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fpaych)
+* **payment channels:**
     * stress testing payment channels via excessive lane creation, excessive payment voucher atomisation, and redemption.
-* **drand incidents and impact on the filecoin network/protocol/chain:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fdrand)
-    * drand total unavailabilities, drand catch-ups, drand slowness, etc.
-* **mempool message selection:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fmempool)
-    * soundness of message selection logic; potentially targeted attacks against miners by flooding their message pools with different kinds of messages.
-* **presealing:** [_(view test scenarios)_](https://github.com/filecoin-project/oni/issues?q=is%3Aissue+sort%3Aupdated-desc+label%3Atopic%2Fpresealing)
-    * TBD, anything related to this worth testing?
-
-## Repository contents
-
-This repository consists of [test plans](https://docs.testground.ai/concepts-and-architecture/test-structure) built to be run on [Testground](https://github.com/testground/testground).
-
-The source code for the various test cases can be found in the [`lotus-soup` directory](https://github.com/filecoin-project/oni/tree/master/lotus-soup).
 
 ## Running the test cases
 
@@ -90,165 +53,8 @@ make build-images
 testground plan import --from ./lotus-soup
 ```
 
-5. Init the `filecoin-ffi` Git submodule in the `extra` folder.
+6. Run a composition for the baseline deals end-to-end test case
-
-```
-git submodule update --init --recursive
-```
-
-6. Compile the `filecoin-ffi` version locally (necessary if you use `local:exec`)
-
-```
-cd extra/filecoin-ffi
-make
-```
-
-7. Run a composition for the baseline deals end-to-end test case
 
 ```
 testground run composition -f ./lotus-soup/_compositions/baseline-docker-5-1.toml
 ```
-
-## Batch-running randomised test cases
-
-The Oni testkit supports [range parameters](https://github.com/filecoin-project/oni/blob/master/lotus-soup/testkit/testenv_ranges.go),
-which test cases can use to generate random values, either at the instance level
-(each instance computes a random value within range), or at the run level (one
-instance computes the values, and propagates them to all other instances via the
-sync service).
-
-For example:
-
-```toml
-latency_range   = '["20ms", "500ms"]'
-loss_range      = '[0, 0.2]'
-```
-
-Could pick a random latency between 20ms and 500ms, and a packet loss
-probability between 0 and 0.2. We could apply those values through the
-`netclient.ConfigureNetwork` Testground SDK API.
-
-Randomized range-based parameters are specially interesting when combined with
-batch runs, as it enables Monte Carlo approaches to testing.
-
-The Oni codebase includes a batch test run driver in package `lotus-soup/runner`.
-You can point it at a composition file that uses range parameters and tell it to
-run N iterations of the test:
-
-```shell script
-$ go run ./runner -runs 5 _compositions/net-chaos/latency.toml
-```
-
-This will run the test as many times as instructed, and will place all outputs
-in a temporary directory. You can pass a concrete output directory with
-the `-output` flag. 
-
-## Catalog
-
-### Test cases part of `lotus-soup`
-
-* `deals-e2e` - Deals end-to-end test case. Clients pick a miner at random, start a deal, wait for it to be sealed, and try to retrieve from another random miner who offers back the data.
-* `drand-halting` - Test case that instructs Drand with a sequence of halt/resume/wait events, while running deals between clients and miners at the same time.
-* `deals-stress` - Deals stress test case. Clients pick a miner and send multiple deals (concurrently or serially) in order to test how many deals miners can handle.
-* `paych-stress` - A test case exercising various payment channel stress tests.
-
-### Compositions part of `lotus-soup`
-
-* `baseline-docker-5-1.toml` - Runs a `baseline` test (deals e2e test) with a network of 5 clients and 1 miner targeting `local:docker`
-* `baseline-k8s-10-3.toml` - Runs a `baseline` test (deals e2e test) with a network of 10 clients and 3 miner targeting `cluster:k8s`
-* `baseline-k8s-3-1.toml` - Runs a `baseline` test (deals e2e test) with a network of 3 clients and 1 miner targeting `cluster:k8s`
-* `baseline-k8s-3-2.toml` - Runs a `baseline` test (deals e2e test) with a network of 3 clients and 2 miner targeting `cluster:k8s`
-* `baseline.toml` - Runs a `baseline` test (deals e2e test) with a network of 3 clients and 2 miner targeting `local:exec`. You have to manually download the proof parameters and place them in `/var/tmp`.
-* `deals-stress-concurrent-natural-k8s.toml`
-* `deals-stress-concurrent-natural.toml`
-* `deals-stress-concurrent.toml`
-* `deals-stress-serial-natural.toml`
-* `deals-stress-serial.toml`
-* `drand-halt.toml`
-* `local-drand.toml`
-* `natural.toml`
-* `paych-stress.toml`
-* `pubsub-tracer.toml`
-
-
-## Debugging
-
-Find commands and how-to guides on debugging test plans at [DELVING.md](https://github.com/filecoin-project/oni/blob/master/DELVING.md)
-
-1. Querying the Lotus RPC API
-
-2. Useful commands / checks
-
-* Making sure miners are on the same chain
-
-* Checking deals
-
-* Sector queries
-
-* Sector sealing errors
-
-## Dependencies
-
-Our current test plan `lotus-soup` is building programatically the Lotus filecoin implementation and therefore requires all it's dependencies. The build process is slightly more complicated than a normal Go project, because we are binding a bit of Rust code. Lotus codebase is in Go, however its `proofs` and `crypto` libraries are in Rust (BLS signatures, SNARK verification, etc.).
-
-Depending on the runner you want to use to run the test plan, these dependencies are included in the build process in a different way, which you should be aware of should you require to use the test plan with a newer version of Lotus:
-
-### Filecoin FFI libraries
-
-* `local:docker`
-
-The Rust libraries are included in the Filecoin FFI Git submodule, which is part of the `iptestground/oni-buildbase` image. If the FFI changes on Lotus, we have to rebuild this image with the `make build-images` command, where X is the next version (see [Docker images changelog](#docker-images-changelog)
-below).
-
-* `local:exec`
-
-The Rust libraries are included via the `extra` directory. Make sure that the test plan reference to Lotus in `go.mod` and the `extra` directory are pointing to the same commit of the FFI git submodule. You also need to compile the `extra/filecoin-ffi` libraries with `make`.
-
-* `cluster:k8s`
-
-The same process as for `local:docker`, however you need to make sure that the respective `iptestground/oni-buildbase` image is available as a public Docker image, so that the Kubernetes cluster can download it.
-
-### proof parameters
-
-Additional to the Filecoin FFI Git submodules, we are also bundling `proof parameters` in the `iptestground/oni-runtime` image. If these change, you will need to rebuild that image with `make build-images` command, where X is the next version.
-
-## Docker images changelog
-
-### oni-buildbase
-
-* `v1` => initial image locking in Filecoin FFI commit ca281af0b6c00314382a75ae869e5cb22c83655b.
-* `v2` => no changes; released only for aligning both images to aesthetically please @nonsense :D
-* `v3` => locking in Filecoin FFI commit 5342c7c97d1a1df4650629d14f2823d52889edd9.
-* `v4` => locking in Filecoin FFI commit 6a143e06f923f3a4f544c7a652e8b4df420a3d28.
-* `v5` => locking in Filecoin FFI commit cddc56607e1d851ea6d09d49404bd7db70cb3c2e.
-* `v6` => locking in Filecoin FFI commit 40569104603407c999d6c9e4c3f1228cbd4d0e5c.
-* `v7` => add Filecoin-BLST repo to buildbase.
-* `v8` => locking in Filecoin FFI commit f640612a1a1f7a2d.
-* `v9` => locking in Filecoin FFI commit 57e38efe4943f09d3127dcf6f0edd614e6acf68e and Filecoin-BLST commit 8609119cf4595d1741139c24378fcd8bc4f1c475.
-
-
-### oni-runtime
-
-* `v1` => initial image with 2048 parameters.
-* `v2` => adds auxiliary tools: `net-tools netcat traceroute iputils-ping wget vim curl telnet iproute2 dnsutils`.
-* `v3` => bump proof parameters from v27 to v28
-
-### oni-runtime-debug
-
-* `v1` => initial image
-* `v2` => locking in Lotus commit e21ea53
-* `v3` => locking in Lotus commit d557c40
-* `v4` => bump proof parameters from v27 to v28
-* `v5` => locking in Lotus commit 1a170e18a
-
-
-## Team
-
-* [@raulk](https://github.com/raulk) (Captain + TL)
-* [@nonsense](https://github.com/nonsense) (Testground TG + engineer)
-* [@yusefnapora](https://github.com/yusefnapora) (engineer and technical writer)
-* [@vyzo](https://github.com/vyzo) (engineer)
-* [@schomatis](https://github.com/schomatis) (advisor)
-* [@willscott](https://github.com/willscott) (engineer)
-* [@alanshaw](https://github.com/alanshaw) (engineer)
-

testplans/docker-images/Dockerfile.oni-buildbase

@@ -2,10 +2,13 @@ ARG GO_VERSION=1.14.2
 
 FROM golang:${GO_VERSION}-buster
 
-RUN apt-get update && apt-get install -y ca-certificates llvm clang mesa-opencl-icd ocl-icd-opencl-dev jq gcc git pkg-config bzr
+RUN apt-get update && apt-get install -y ca-certificates llvm clang mesa-opencl-icd ocl-icd-opencl-dev jq gcc git pkg-config bzr libhwloc-dev
 
-ARG FILECOIN_FFI_COMMIT=57e38efe4943f09d3127dcf6f0edd614e6acf68e
+ARG FILECOIN_FFI_COMMIT=1985275547f222e8c97a8ab70b5cc26bc1fa50b1
-ARG FFI_DIR=/extra/filecoin-ffi
+ARG FFI_DIR=/extern/filecoin-ffi
+
+ARG BLST_COMMIT=1cbb16ed9580dcd3e9593b71221fcf2a048faaef
+ARG BLST_DIR=/extern/blst
 
 RUN mkdir -p ${FFI_DIR} \
     && git clone https://github.com/filecoin-project/filecoin-ffi.git ${FFI_DIR} \
@@ -13,10 +16,9 @@ RUN mkdir -p ${FFI_DIR} \
     && git checkout ${FILECOIN_FFI_COMMIT} \
     && make
 
-ARG FIL_BLST_COMMIT=8609119cf4595d1741139c24378fcd8bc4f1c475
-ARG BLST_DIR=/extra/fil-blst
-
 RUN mkdir -p ${BLST_DIR} \
-    && git clone https://github.com/filecoin-project/fil-blst.git ${BLST_DIR} \
+    && git clone https://github.com/supranational/blst.git ${BLST_DIR} \
     && cd ${BLST_DIR} \
-    && git checkout ${FIL_BLST_COMMIT}
+    && git checkout ${BLST_COMMIT}
+
+RUN ldconfig

testplans/docker-images/Dockerfile.oni-runtime

@@ -14,5 +14,10 @@ RUN paramfetch 2048 /proof-parameters.json
 
 FROM ubuntu:18.04
 
-RUN apt-get update && apt-get install -y ca-certificates llvm clang mesa-opencl-icd ocl-icd-opencl-dev jq gcc pkg-config net-tools netcat traceroute iputils-ping wget vim curl telnet iproute2 dnsutils
+RUN apt-get update && apt-get install -y ca-certificates llvm clang mesa-opencl-icd ocl-icd-opencl-dev gcc pkg-config libhwloc-dev
+
+RUN apt-get install -y jq net-tools netcat traceroute iputils-ping wget vim curl telnet iproute2 dnsutils
+
 COPY --from=downloader /var/tmp/filecoin-proof-parameters /var/tmp/filecoin-proof-parameters
+
+RUN ldconfig

testplans/extra/fil-blst

@@ -1 +0,0 @@
-Subproject commit 5f93488fc0dbfb450f2355269f18fc67010d59bb

testplans/extra/filecoin-ffi

@@ -1 +0,0 @@
-Subproject commit f640612a1a1f7a2dd8b3a49e1531db0aa0f63447

testplans/graphsync/go.mod

@@ -1,4 +1,4 @@
-module github.com/libp2p/test-plans/ping
+module github.com/filecoin-project/lotus/testplans/graphsync
 
 go 1.14
 

testplans/lotus-soup/go.mod

@@ -1,13 +1,11 @@
-module github.com/filecoin-project/oni/lotus-soup
+module github.com/filecoin-project/lotus/testplans/lotus-soup
 
 go 1.14
 
 require (
 	contrib.go.opencensus.io/exporter/prometheus v0.1.0
-	github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
 	github.com/codeskyblue/go-sh v0.0.0-20200712050446-30169cf553fe
 	github.com/davecgh/go-spew v1.1.1
-	github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
 	github.com/drand/drand v1.1.2-0.20200905144319-79c957281b32
 	github.com/filecoin-project/go-address v0.0.4
 	github.com/filecoin-project/go-fil-markets v0.7.1
@@ -15,11 +13,11 @@ require (
 	github.com/filecoin-project/go-state-types v0.0.0-20200928172055-2df22083d8ab
 	github.com/filecoin-project/go-storedcounter v0.0.0-20200421200003-1c99c62e8a5b
 	github.com/filecoin-project/lotus v0.9.2-0.20201012041700-a2e0832a12f2
+	github.com/filecoin-project/oni/lotus-soup v0.0.0-20201016183302-a8430088b2b8
 	github.com/filecoin-project/specs-actors v0.9.12
 	github.com/google/uuid v1.1.1
 	github.com/gorilla/mux v1.7.4
 	github.com/hashicorp/go-multierror v1.1.0
-	github.com/influxdata/influxdb v1.8.0 // indirect
 	github.com/ipfs/go-cid v0.0.7
 	github.com/ipfs/go-datastore v0.4.5
 	github.com/ipfs/go-ipfs-files v0.0.8
@@ -29,29 +27,19 @@ require (
 	github.com/ipfs/go-unixfs v0.2.4
 	github.com/ipld/go-car v0.1.1-0.20200923150018-8cdef32e2da4
 	github.com/kpacha/opencensus-influxdb v0.0.0-20181102202715-663e2683a27c
-	github.com/kr/text v0.2.0 // indirect
 	github.com/libp2p/go-libp2p v0.11.0
 	github.com/libp2p/go-libp2p-core v0.6.1
 	github.com/libp2p/go-libp2p-pubsub-tracer v0.0.0-20200626141350-e730b32bf1e6
 	github.com/multiformats/go-multiaddr v0.3.1
 	github.com/multiformats/go-multiaddr-net v0.2.0
-	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	github.com/stretchr/objx v0.2.0 // indirect
 	github.com/testground/sdk-go v0.2.6-0.20201016180515-1e40e1b0ec3a
 	go.opencensus.io v0.22.4
-	golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
 	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
-	golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect
-	google.golang.org/protobuf v1.25.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
-	honnef.co/go/tools v0.0.1-2020.1.3 // indirect
 )
 
 // This will work in all build modes: docker:go, exec:go, and local go build.
 // On docker:go and exec:go, it maps to /extra/filecoin-ffi, as it's picked up
 // as an "extra source" in the manifest.
-replace github.com/filecoin-project/filecoin-ffi => ../extra/filecoin-ffi
+replace github.com/filecoin-project/filecoin-ffi => ../../extern/filecoin-ffi
 
-replace github.com/supranational/blst => ../extra/fil-blst/blst
+replace github.com/supranational/blst => ../../extern/blst
-
-replace github.com/filecoin-project/fil-blst => ../extra/fil-blst

testplans/lotus-soup/go.sum

@@ -30,7 +30,6 @@ dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1
 dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
 git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
 github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
-github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9 h1:HD8gA2tkByhMAwYaFAX9w2l7vxvBQ5NMoxDrkhqhtn4=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIoKjsnZuH8vjyaysT/ses3EvZeaV/1UkF2M=
 github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
@@ -90,7 +89,6 @@ github.com/aws/aws-sdk-go v1.32.11/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZve
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
 github.com/beevik/ntp v0.2.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NRpg=
 github.com/benbjohnson/clock v1.0.1/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
-github.com/benbjohnson/clock v1.0.2 h1:Z0CN0Yb4ig9sGPXkvAQcGJfnrrMQ5QYLCMPRi9iD7YE=
 github.com/benbjohnson/clock v1.0.2/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
 github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg=
 github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
@@ -102,7 +100,6 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
 github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
-github.com/briandowns/spinner v1.11.1 h1:OixPqDEcX3juo5AjQZAnFPbeUA0jvkp2qzB5gOZJ/L0=
 github.com/briandowns/spinner v1.11.1/go.mod h1:QOuQk7x+EaDASo80FEXwlwiA+j/PPIcX3FScO+3/ZPQ=
 github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8=
 github.com/btcsuite/btcd v0.0.0-20190523000118-16327141da8c/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI=
@@ -179,7 +176,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davidlazar/go-crypto v0.0.0-20170701192655-dcfb0a7ac018/go.mod h1:rQYf4tfk5sSwFsnDg3qYaBxSjsD9S8+59vW0dKUgme4=
-github.com/davidlazar/go-crypto v0.0.0-20190912175916-7055855a373f h1:BOaYiTvg8p9vBUXpklC22XSK/mifLF7lG9jtmYYi3Tc=
 github.com/davidlazar/go-crypto v0.0.0-20190912175916-7055855a373f/go.mod h1:rQYf4tfk5sSwFsnDg3qYaBxSjsD9S8+59vW0dKUgme4=
 github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR6AkioZ1ySsx5yxlDQZ8stG2b88gTPxgJU=
 github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U=
@@ -190,12 +186,10 @@ github.com/dgraph-io/badger v1.6.0-rc1/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhY
 github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
 github.com/dgraph-io/badger v1.6.1 h1:w9pSFNSdq/JPM1N12Fz/F/bzo993Is1W+Q7HjPzi7yg=
 github.com/dgraph-io/badger v1.6.1/go.mod h1:FRmFw3uxvcpa8zG3Rxs0th+hCLIuaQg8HlNV5bjgnuU=
-github.com/dgraph-io/badger/v2 v2.0.3 h1:inzdf6VF/NZ+tJ8RwwYMjJMvsOALTHYdozn0qSl6XJI=
 github.com/dgraph-io/badger/v2 v2.0.3/go.mod h1:3KY8+bsP8wI0OEnQJAKpd4wIJW/Mm32yw2j/9FUVnIM=
 github.com/dgraph-io/badger/v2 v2.2007.2 h1:EjjK0KqwaFMlPin1ajhP943VPENHJdEz1KLIegjaI3k=
 github.com/dgraph-io/badger/v2 v2.2007.2/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE=
 github.com/dgraph-io/ristretto v0.0.2-0.20200115201040-8f368f2f2ab3/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
-github.com/dgraph-io/ristretto v0.0.2 h1:a5WaUrDa0qm0YrAAS1tUykT5El3kt62KNZZeMxQn3po=
 github.com/dgraph-io/ristretto v0.0.2/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
 github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de h1:t0UHb5vdojIDUqktM6+xJAfScFBsVpXZmqC9dsgJmeA=
 github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
@@ -237,20 +231,16 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5 h1:BBso6MBKW8ncyZLv37o+KNyy0HrrHgfnOaGQC2qvN+A=
 github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5/go.mod h1:JpoxHjuQauoxiFMl1ie8Xc/7TfLuMZ5eOCONd1sUBHg=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fatih/color v1.8.0 h1:5bzFgL+oy7JITMTxUPJ00n7VxmYd/PdMp5mHFX40/RY=
 github.com/fatih/color v1.8.0/go.mod h1:3l45GVGkyrnYNl9HoIjnp2NnNWvh6hLAqD8yTfGjnw8=
 github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fd/go-nat v1.0.0/go.mod h1:BTBu/CKvMmOMUPkKVef1pngt2WFH/lg7E6yQnulfp6E=
-github.com/filecoin-project/go-address v0.0.3 h1:eVfbdjEbpbzIrbiSa+PiGUY+oDK9HnUn+M1R/ggoHf8=
 github.com/filecoin-project/go-address v0.0.3/go.mod h1:jr8JxKsYx+lQlQZmF5i2U0Z+cGQ59wMIps/8YW/lDj8=
 github.com/filecoin-project/go-address v0.0.4 h1:gSNMv0qWwH16fGQs7ycOUrDjY6YCSsgLUl0I0KLjo8w=
 github.com/filecoin-project/go-address v0.0.4/go.mod h1:jr8JxKsYx+lQlQZmF5i2U0Z+cGQ59wMIps/8YW/lDj8=
-github.com/filecoin-project/go-amt-ipld/v2 v2.1.0 h1:t6qDiuGYYngDqaLc2ZUvdtAg4UNxPeOYaXhBWSNsVaM=
 github.com/filecoin-project/go-amt-ipld/v2 v2.1.0/go.mod h1:nfFPoGyX0CU9SkXX8EoCcSuHN1XcbN0c6KBh7yvP5fs=
 github.com/filecoin-project/go-amt-ipld/v2 v2.1.1-0.20201006184820-924ee87a1349 h1:pIuR0dnMD0i+as8wNnjjHyQrnhP5O5bmba/lmgQeRgU=
 github.com/filecoin-project/go-amt-ipld/v2 v2.1.1-0.20201006184820-924ee87a1349/go.mod h1:vgmwKBkx+ca5OIeEvstiQgzAZnb7R6QaqE1oEDSqa6g=
-github.com/filecoin-project/go-bitfield v0.2.0 h1:gCtLcjskIPtdg4NfN7gQZSQF9yrBQ7mkT0qCJxzGI2Q=
 github.com/filecoin-project/go-bitfield v0.2.0/go.mod h1:CNl9WG8hgR5mttCnUErjcQjGvuiZjRqK9rHVBsQF4oM=
 github.com/filecoin-project/go-bitfield v0.2.1 h1:S6Uuqcspqu81sWJ0He4OAfFLm1tSwPdVjtKTkl5m/xQ=
 github.com/filecoin-project/go-bitfield v0.2.1/go.mod h1:CNl9WG8hgR5mttCnUErjcQjGvuiZjRqK9rHVBsQF4oM=
@@ -280,11 +270,9 @@ github.com/filecoin-project/go-paramfetch v0.0.2-0.20200701152213-3e0f0afdc261 h
 github.com/filecoin-project/go-paramfetch v0.0.2-0.20200701152213-3e0f0afdc261/go.mod h1:fZzmf4tftbwf9S37XRifoJlz7nCjRdIrMGLR07dKLCc=
 github.com/filecoin-project/go-state-types v0.0.0-20200903145444-247639ffa6ad/go.mod h1:IQ0MBPnonv35CJHtWSN3YY1Hz2gkPru1Q9qoaYLxx9I=
 github.com/filecoin-project/go-state-types v0.0.0-20200904021452-1883f36ca2f4/go.mod h1:IQ0MBPnonv35CJHtWSN3YY1Hz2gkPru1Q9qoaYLxx9I=
-github.com/filecoin-project/go-state-types v0.0.0-20200905071437-95828685f9df h1:m2esXSuGBkuXlRyCsl1a/7/FkFam63o1OzIgzaHtOfI=
 github.com/filecoin-project/go-state-types v0.0.0-20200905071437-95828685f9df/go.mod h1:IQ0MBPnonv35CJHtWSN3YY1Hz2gkPru1Q9qoaYLxx9I=
 github.com/filecoin-project/go-state-types v0.0.0-20200928172055-2df22083d8ab h1:cEDC5Ei8UuT99hPWhCjA72SM9AuRtnpvdSTIYbnzN8I=
 github.com/filecoin-project/go-state-types v0.0.0-20200928172055-2df22083d8ab/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
-github.com/filecoin-project/go-statemachine v0.0.0-20200714194326-a77c3ae20989 h1:1GjCS3xy/CRIw7Tq0HfzX6Al8mklrszQZ3iIFnjPzHk=
 github.com/filecoin-project/go-statemachine v0.0.0-20200714194326-a77c3ae20989/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig=
 github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe h1:dF8u+LEWeIcTcfUcCf3WFVlc81Fr2JKg8zPzIbBDKDw=
 github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig=
@@ -294,6 +282,8 @@ github.com/filecoin-project/go-storedcounter v0.0.0-20200421200003-1c99c62e8a5b
 github.com/filecoin-project/go-storedcounter v0.0.0-20200421200003-1c99c62e8a5b/go.mod h1:Q0GQOBtKf1oE10eSXSlhN45kDBdGvEcVOqMiffqX+N8=
 github.com/filecoin-project/lotus v0.9.2-0.20201012041700-a2e0832a12f2 h1:LS2lchwWKv3vnyrOtlvYISl1NIcDpL9baemE1T0tDS4=
 github.com/filecoin-project/lotus v0.9.2-0.20201012041700-a2e0832a12f2/go.mod h1:mtewzEjzt/ghDb1lfq9Td2hRY312ySuXJsLdy6DKGME=
+github.com/filecoin-project/oni/lotus-soup v0.0.0-20201016183302-a8430088b2b8 h1:1c12tiuKYXWmZuZusFYOmXIZFewy69mns6Zz03yqjlI=
+github.com/filecoin-project/oni/lotus-soup v0.0.0-20201016183302-a8430088b2b8/go.mod h1:ord2u62C7SvGvbAoImfPISkm6INaA3bnAKSBRGQ4Nj4=
 github.com/filecoin-project/specs-actors v0.9.4/go.mod h1:BStZQzx5x7TmCkLv0Bpa07U6cPKol6fd3w9KjMPZ6Z4=
 github.com/filecoin-project/specs-actors v0.9.7/go.mod h1:wM2z+kwqYgXn5Z7scV1YHLyd1Q1cy0R8HfTIWQ0BFGU=
 github.com/filecoin-project/specs-actors v0.9.12 h1:iIvk58tuMtmloFNHhAOQHG+4Gci6Lui0n7DYQGi3cJk=
@@ -574,7 +564,6 @@ github.com/ipfs/go-fs-lock v0.0.6/go.mod h1:OTR+Rj9sHiRubJh3dRhD15Juhd/+w6VPOY28
 github.com/ipfs/go-graphsync v0.1.0/go.mod h1:jMXfqIEDFukLPZHqDPp8tJMbHO9Rmeb9CEGevngQbmE=
 github.com/ipfs/go-graphsync v0.2.1 h1:MdehhqBSuTI2LARfKLkpYnt0mUrqHs/mtuDnESXHBfU=
 github.com/ipfs/go-graphsync v0.2.1/go.mod h1:gEBvJUNelzMkaRPJTpg/jaKN4AQW/7wDWu0K92D8o10=
-github.com/ipfs/go-hamt-ipld v0.1.1 h1:0IQdvwnAAUKmDE+PMJa5y1QiwOPHpI9+eAbQEEEYthk=
 github.com/ipfs/go-hamt-ipld v0.1.1/go.mod h1:1EZCr2v0jlCnhpa+aZ0JZYp8Tt2w16+JJOAVz17YcDk=
 github.com/ipfs/go-ipfs-blockstore v0.0.1/go.mod h1:d3WClOmRQKFnJ0Jz/jj/zmksX0ma1gROTlovZKBmN08=
 github.com/ipfs/go-ipfs-blockstore v0.1.0/go.mod h1:5aD0AvHPi7mZc6Ci1WCAhiBQu2IsfTduLl+422H6Rqw=
@@ -680,11 +669,9 @@ github.com/ipfs/iptb-plugins v0.2.1 h1:au4HWn9/pRPbkxA08pDx2oRAs4cnbgQWgV0teYXuu
 github.com/ipfs/iptb-plugins v0.2.1/go.mod h1:QXMbtIWZ+jRsW8a4h13qAKU7jcM7qaittO8wOsTP0Rs=
 github.com/ipld/go-car v0.1.1-0.20200923150018-8cdef32e2da4 h1:6phjU3kXvCEWOZpu+Ob0w6DzgPFZmDLgLPxJhD8RxEY=
 github.com/ipld/go-car v0.1.1-0.20200923150018-8cdef32e2da4/go.mod h1:xrMEcuSq+D1vEwl+YAXsg/JfA98XGpXDwnkIL4Aimqw=
-github.com/ipld/go-ipld-prime v0.0.2-0.20200428162820-8b59dc292b8e h1:ZISbJlM0urTANR9KRfRaqlBmyOj5uUtxs2r4Up9IXsA=
 github.com/ipld/go-ipld-prime v0.0.2-0.20200428162820-8b59dc292b8e/go.mod h1:uVIwe/u0H4VdKv3kaN1ck7uCb6yD9cFLS9/ELyXbsw8=
 github.com/ipld/go-ipld-prime v0.5.1-0.20200828233916-988837377a7f h1:XpOuNQ5GbXxUcSukbQcW9jkE7REpaFGJU2/T00fo9kA=
 github.com/ipld/go-ipld-prime v0.5.1-0.20200828233916-988837377a7f/go.mod h1:0xEgdD6MKbZ1vF0GC+YcR/C4SQCAlRuOjIJ2i0HxqzM=
-github.com/ipld/go-ipld-prime-proto v0.0.0-20200428191222-c1ffdadc01e1 h1:K1Ysr7kgIlo7YQkPqdkA6H7BVdIugvuAz7OQUTJxLdE=
 github.com/ipld/go-ipld-prime-proto v0.0.0-20200428191222-c1ffdadc01e1/go.mod h1:OAV6xBmuTLsPZ+epzKkPB1e25FHk/vCtyatkdHcArLs=
 github.com/ipld/go-ipld-prime-proto v0.0.0-20200922192210-9a2bfd4440a6 h1:6Mq+tZGSEMEoJJ1NbJRhddeelkXZcU8yfH/ZRYUo/Es=
 github.com/ipld/go-ipld-prime-proto v0.0.0-20200922192210-9a2bfd4440a6/go.mod h1:3pHYooM9Ea65jewRwrb2u5uHZCNkNTe9ABsVB+SrkH0=
@@ -908,7 +895,6 @@ github.com/libp2p/go-libp2p-net v0.0.2/go.mod h1:Yt3zgmlsHOgUWSXmt5V/Jpz9upuJBE8
 github.com/libp2p/go-libp2p-netutil v0.0.1/go.mod h1:GdusFvujWZI9Vt0X5BKqwWWmZFxecf9Gt03cKxm2f/Q=
 github.com/libp2p/go-libp2p-netutil v0.1.0 h1:zscYDNVEcGxyUpMd0JReUZTrpMfia8PmLKcKF72EAMQ=
 github.com/libp2p/go-libp2p-netutil v0.1.0/go.mod h1:3Qv/aDqtMLTUyQeundkKsA+YCThNdbQD54k3TqjpbFU=
-github.com/libp2p/go-libp2p-noise v0.1.1 h1:vqYQWvnIcHpIoWJKC7Al4D6Hgj0H012TuXRhPwSMGpQ=
 github.com/libp2p/go-libp2p-noise v0.1.1/go.mod h1:QDFLdKX7nluB7DEnlVPbz7xlLHdwHFA9HiohJRr3vwM=
 github.com/libp2p/go-libp2p-noise v0.1.2 h1:IH9GRihQJTx56obm+GnpdPX4KeVIlvpXrP6xnJ0wxWk=
 github.com/libp2p/go-libp2p-noise v0.1.2/go.mod h1:9B10b7ueo7TIxZHHcjcDCo5Hd6kfKT2m77by82SFRfE=
@@ -1093,7 +1079,6 @@ github.com/marten-seemann/qtls-go1-15 v0.1.0/go.mod h1:GyFwywLKkRt+6mfU99csTEY1j
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@@ -1514,8 +1499,8 @@ github.com/whyrusleeping/yamux v1.1.5/go.mod h1:E8LnQQ8HKx5KD29HZFUwM1PxCOdPRzGw
 github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
 github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7VPsoEPHyzalCE06qoARUCeBBE=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-github.com/xlab/c-for-go v0.0.0-20200718154222-87b0065af829 h1:wb7xrDzfkLgPHsSEBm+VSx6aDdi64VtV0xvP0E6j8bk=
+github.com/xlab/c-for-go v0.0.0-20201002084316-c134bfab968f h1:nMhj+x/m7ZQsHBz0L3gpytp0v6ogokdbrQDnhB8Kh7s=
-github.com/xlab/c-for-go v0.0.0-20200718154222-87b0065af829/go.mod h1:h/1PEBwj7Ym/8kOuMWvO2ujZ6Lt+TMbySEXNhjjR87I=
+github.com/xlab/c-for-go v0.0.0-20201002084316-c134bfab968f/go.mod h1:h/1PEBwj7Ym/8kOuMWvO2ujZ6Lt+TMbySEXNhjjR87I=
 github.com/xlab/pkgconfig v0.0.0-20170226114623-cea12a0fd245 h1:Sw125DKxZhPUI4JLlWugkzsrlB50jR9v2khiD9FxuSo=
 github.com/xlab/pkgconfig v0.0.0-20170226114623-cea12a0fd245/go.mod h1:C+diUUz7pxhNY6KAoLgrTYARGWnt82zWTylZlxT92vk=
 github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=

testplans/lotus-soup/manifest.toml

@@ -1,5 +1,4 @@
 name = "lotus-soup"
-extra_sources = { "exec:go" = ["../extra/filecoin-ffi", "../extra/fil-blst"] }
 
 [defaults]
 builder = "docker:go"
@@ -10,8 +9,8 @@ enabled = true
 
 [builders."docker:go"]
 enabled = true
-build_base_image = "iptestground/oni-buildbase:v9"
+build_base_image = "iptestground/oni-buildbase:v11-lotus"
-runtime_image = "iptestground/oni-runtime:v5-debug"
+runtime_image = "iptestground/oni-runtime:v5"
 
 [runners."local:exec"]
 enabled = true