cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

export both apis for miners

Browse Source
This commit is contained in:
Anton Evangelatov 2020-07-01 18:54:20 +02:00
parent e7488209c8
commit 167a30fcb9
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lotus-soup/manifest.toml
View File

@ -10,6 +10,9 @@ enabled = true
build_base_image = "iptestground/oni-buildbase:v1" build_base_image = "iptestground/oni-buildbase:v1"
runtime_image = "iptestground/oni-runtime:v1" runtime_image = "iptestground/oni-runtime:v1"
[builders."docker:go".dockerfile_extensions]
exposed_ports = ["6060", "1234", "2345"]
[runners."local:docker"] [runners."local:docker"]
enabled = true enabled = true

12
lotus-soup/testkit/role_miner.go
View File

@ -170,6 +170,7 @@ func PrepareMiner(t *TestEnvironment) (*LotusMiner, error) {
node.Online(), node.Online(),
node.Repo(nodeRepo), node.Repo(nodeRepo),
withGenesis(genesisMsg.Genesis), withGenesis(genesisMsg.Genesis),
withApiEndpoint("/ip4/127.0.0.1/tcp/1234"),
withListenAddress(minerIP), withListenAddress(minerIP),
withBootstrapper(genesisMsg.Bootstrapper), withBootstrapper(genesisMsg.Bootstrapper),
withPubsubConfig(false, pubsubTracer), withPubsubConfig(false, pubsubTracer),
@ -191,7 +192,7 @@ func PrepareMiner(t *TestEnvironment) (*LotusMiner, error) {
node.Online(), node.Online(),
node.Repo(minerRepo), node.Repo(minerRepo),
node.Override(new(api.FullNode), n.FullApi), 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), withMinerListenAddress(minerIP),
} }
@ -282,7 +283,12 @@ func PrepareMiner(t *TestEnvironment) (*LotusMiner, error) {
m := &LotusMiner{n, t} 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 { if err != nil {
return nil, err return nil, err
} }
@ -358,7 +364,7 @@ func (m *LotusMiner) RunDefault() error {
return nil 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() mux := mux.NewRouter()
rpcServer := jsonrpc.NewServer() rpcServer := jsonrpc.NewServer()