Merge pull request #90 from filecoin-project/hook-up-miner-rpc-apis

export both apis for miners
filecoin-project · Jul 2, 2020 · b601fd1 · b601fd1
2 parents 6d0c0b4 + 740741b
commit b601fd1
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 3 deletions.
diff --git a/lotus-soup/compositions/composition-k8s-10-3.toml b/lotus-soup/compositions/composition-k8s-10-3.toml
@@ -15,6 +15,9 @@
   go_proxy_url="http://localhost:8081"
   registry_type="aws"
 
+[global.run_config]
+  exposed_ports = ["6060", "1234", "2345"]
+
 [global.run.test_params]
   clients = "10"
   miners = "3"

diff --git a/lotus-soup/compositions/composition-k8s-3-1.toml b/lotus-soup/compositions/composition-k8s-3-1.toml
@@ -15,6 +15,9 @@
   go_proxy_url="http://localhost:8081"
   registry_type="aws"
 
+[global.run_config]
+  exposed_ports = ["6060", "1234", "2345"]
+
 [global.run.test_params]
   clients = "3"
   miners = "1"

diff --git a/lotus-soup/compositions/composition-k8s-3-2.toml b/lotus-soup/compositions/composition-k8s-3-2.toml
@@ -15,6 +15,9 @@
   go_proxy_url="http://localhost:8081"
   registry_type="aws"
 
+[global.run_config]
+  exposed_ports = ["6060", "1234", "2345"]
+
 [global.run.test_params]
   clients = "3"
   miners = "2"

diff --git a/lotus-soup/compositions/composition-k8s.toml b/lotus-soup/compositions/composition-k8s.toml
@@ -15,6 +15,9 @@
   go_proxy_url="http://localhost:8081"
   registry_type="aws"
 
+[global.run_config]
+  exposed_ports = ["6060", "1234", "2345"]
+
 [global.run.test_params]
   clients = "1"
   miners = "1"

diff --git a/lotus-soup/compositions/composition.toml b/lotus-soup/compositions/composition.toml
@@ -12,6 +12,9 @@
 [global.build_config]
   enable_go_build_cache = true
 
+[global.run_config]
+  exposed_ports = ["6060", "1234", "2345"]
+
 [global.build]
   selectors = ["testground"]
 

diff --git a/lotus-soup/manifest.toml b/lotus-soup/manifest.toml
@@ -42,6 +42,7 @@ instances = { min = 1, max = 100, default = 5 }
 
   # Params relevant to pubsub tracing
   enable_pubsub_tracer = { type = "bool", default = false }
+  mining_mode = { type = "enum", default = "synchronized", options = ["synchronized", "natural"] }
 
 [[testcases]]
 name = "drand-halting"

diff --git a/lotus-soup/testkit/role_miner.go b/lotus-soup/testkit/role_miner.go
@@ -170,6 +170,7 @@ func PrepareMiner(t *TestEnvironment) (*LotusMiner, error) {
 		node.Online(),
 		node.Repo(nodeRepo),
 		withGenesis(genesisMsg.Genesis),
+		withApiEndpoint("/ip4/127.0.0.1/tcp/1234"),
 		withListenAddress(minerIP),
 		withBootstrapper(genesisMsg.Bootstrapper),
 		withPubsubConfig(false, pubsubTracer),
@@ -191,7 +192,7 @@ func PrepareMiner(t *TestEnvironment) (*LotusMiner, error) {
 		node.Online(),
 		node.Repo(minerRepo),
 		node.Override(new(api.FullNode), n.FullApi),
-		withApiEndpoint("/ip4/127.0.0.1/tcp/1234"),
+		withApiEndpoint("/ip4/127.0.0.1/tcp/2345"),
 		withMinerListenAddress(minerIP),
 	}
 
@@ -282,7 +283,12 @@ func PrepareMiner(t *TestEnvironment) (*LotusMiner, error) {
 
 	m := &LotusMiner{n, t}
 
-	err = m.startStorageMinerAPIServer(minerRepo, n.MinerApi)
+	err = startClientAPIServer(nodeRepo, n.FullApi)
+	if err != nil {
+		return nil, err
+	}
+
+	err = startStorageMinerAPIServer(minerRepo, n.MinerApi)
 	if err != nil {
 		return nil, err
 	}
@@ -358,7 +364,7 @@ func (m *LotusMiner) RunDefault() error {
 	return nil
 }
 
-func (m *LotusMiner) startStorageMinerAPIServer(repo *repo.MemRepo, minerApi api.StorageMiner) error {
+func startStorageMinerAPIServer(repo *repo.MemRepo, minerApi api.StorageMiner) error {
 	mux := mux.NewRouter()
 
 	rpcServer := jsonrpc.NewServer()