Anton Evangelatov 4f0a96c9c7 resolved conflicts

2021-06-30 13:16:52 +02:00

..

blockminer.go

rename {kit2=>kit}.

2021-06-18 19:45:29 +01:00

client.go

Merge branch 'master' into raulk/itests-refactor-kit

2021-06-21 18:26:04 +01:00

deals_state.go

rename {kit2=>kit}.

2021-06-18 19:45:29 +01:00

deals.go

resolved conflicts

2021-06-30 13:16:52 +02:00

ensemble_opts.go

fix proof types.

2021-06-21 13:24:25 +01:00

ensemble_presets.go

enable libp2p options

2021-06-30 12:55:43 +02:00

ensemble.go

enable libp2p options

2021-06-30 12:55:43 +02:00

files.go

rename {kit2=>kit}.

2021-06-18 19:45:29 +01:00

funds.go

rename {kit2=>kit}.

2021-06-18 19:45:29 +01:00

init.go

rename {kit2=>kit}.

2021-06-18 19:45:29 +01:00

log.go

rename {kit2=>kit}.

2021-06-18 19:45:29 +01:00

mockcli.go

rename {kit2=>kit}.

2021-06-18 19:45:29 +01:00

node_full.go

rename {kit2=>kit}.

2021-06-18 19:45:29 +01:00

node_miner.go

resolve merge conflicts

2021-06-22 11:28:23 +02:00

node_opts_nv.go

rename {kit2=>kit}.

2021-06-18 19:45:29 +01:00

node_opts.go

enable libp2p options

2021-06-30 12:55:43 +02:00

rpc.go

adding TestDealWithMarketAndMinerNode

2021-06-23 12:44:52 +02:00

run.go

declare some tests as expensive.

2021-06-23 16:37:43 +01:00