Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: read data-dir from config.yaml #300

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/status.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,23 @@ export function getStatus() {
assetsReady: isBeeAssetReady(),
}

if (!checkPath('config.yaml') || !checkPath('data-dir')) {
if (!checkPath('config.yaml')) {
return status
}

status.config = readConfigYaml()
status.address = readEthereumAddress()

if (!checkPath(status.config['data-dir'])) {
return status
}

status.address = readEthereumAddress(status.config['data-dir'])

return status
}

function readEthereumAddress() {
const path = getPath(join('data-dir', 'keys', 'swarm.key'))
function readEthereumAddress(dataDir = 'data-dir') {
const path = getPath(join(dataDir, 'keys', 'swarm.key'))
const swarmKeyFile = readFileSync(path, 'utf-8')
const v3 = JSON.parse(swarmKeyFile)

Expand Down