Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

Nc 2107 permissioning config toml file #643

Merged
merged 51 commits into from
Jan 29, 2019
Merged
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
c787dea
typo
macfarla Jan 22, 2019
6ce9630
typos
macfarla Jan 22, 2019
a614ffa
typo
macfarla Jan 22, 2019
bfdf859
create permissioning config from toml file
macfarla Jan 22, 2019
0239012
merged master
macfarla Jan 22, 2019
58bfa1b
fixed merge issue
macfarla Jan 22, 2019
cc38ef6
don't throw
macfarla Jan 22, 2019
260d417
Merge branch 'master' of github.com:PegaSysEng/pantheon into nc-2107-…
macfarla Jan 23, 2019
426b644
parse TOML file for permissioning config
macfarla Jan 23, 2019
3aa9f1a
Merge branch 'master' of github.com:PegaSysEng/pantheon into nc-2107-…
macfarla Jan 23, 2019
c5e5516
typo
macfarla Jan 22, 2019
802279f
typos
macfarla Jan 22, 2019
6c8dcdb
typo
macfarla Jan 22, 2019
a5a1dac
create permissioning config from toml file
macfarla Jan 22, 2019
3e77b52
don't throw
macfarla Jan 22, 2019
c89768f
parse TOML file for permissioning config
macfarla Jan 23, 2019
430b010
Merge branch 'nc-2107-permissioning-config-toml-file' of github.com:m…
macfarla Jan 23, 2019
3aeb719
added a separate non-CLI toml parser
macfarla Jan 24, 2019
3aad74e
formatting
macfarla Jan 24, 2019
5fafd91
added tests
macfarla Jan 24, 2019
6944ec1
formatting
macfarla Jan 24, 2019
fcfca80
avoid 2 x log messages
macfarla Jan 24, 2019
8a6ee0f
ignore tests
macfarla Jan 24, 2019
10d12d0
Merge branch 'master' of github.com:PegaSysEng/pantheon into nc-2107-…
macfarla Jan 24, 2019
d5b7739
added CLI options for separately enabling node and account permissioning
macfarla Jan 25, 2019
7e2398a
Merge branch 'master' of github.com:PegaSysEng/pantheon into nc-2107-…
macfarla Jan 25, 2019
5d9f833
tidying up
macfarla Jan 25, 2019
73c8ed5
handle when default permissions config file does not exist
macfarla Jan 25, 2019
b9dce8f
handle when default permissions config file does not exist
macfarla Jan 25, 2019
6e966d8
Merge branch 'master' of github.com:PegaSysEng/pantheon into nc-2107-…
macfarla Jan 25, 2019
a46fc2f
added tests
macfarla Jan 25, 2019
cfb5531
moved check for bootnodes on whitelist out of CLI
macfarla Jan 26, 2019
2867d41
Merge branch 'master' of github.com:PegaSysEng/pantheon into nc-2107-…
macfarla Jan 26, 2019
5d7296c
added tests
macfarla Jan 26, 2019
2542d61
Merge branch 'master' of github.com:PegaSysEng/pantheon into nc-2107-…
macfarla Jan 29, 2019
39876ed
Merge branch 'master' of github.com:PegaSysEng/pantheon into nc-2107-…
macfarla Jan 29, 2019
5980e2a
added test and set to empty list if toml key/value is absent
macfarla Jan 29, 2019
d45e2de
PR comments
macfarla Jan 29, 2019
586a820
PR comments
macfarla Jan 29, 2019
f29d7da
Merge branch 'master' of github.com:PegaSysEng/pantheon into nc-2107-…
macfarla Jan 29, 2019
2395ea7
copied code to convert from Peer to enode format
macfarla Jan 29, 2019
81fb444
missed a
macfarla Jan 29, 2019
b08f6ca
Merge branch 'master' into nc-2107-permissioning-config-toml-file
mark-terry Jan 29, 2019
fc440e3
Merge branch 'master' of github.com:PegaSysEng/pantheon into nc-2107-…
macfarla Jan 29, 2019
dc26bdc
Merge branch 'nc-2107-permissioning-config-toml-file' of github.com:m…
macfarla Jan 29, 2019
9f620ae
Merge branch 'master' into nc-2107-permissioning-config-toml-file
mark-terry Jan 29, 2019
4ab5799
Merge branch 'master' into nc-2107-permissioning-config-toml-file
mark-terry Jan 29, 2019
2a10a44
Merge branch 'master' into nc-2107-permissioning-config-toml-file
macfarla Jan 29, 2019
0ce41e7
Merge branch 'master' into nc-2107-permissioning-config-toml-file
macfarla Jan 29, 2019
2619368
Merge branch 'master' into nc-2107-permissioning-config-toml-file
macfarla Jan 29, 2019
3302150
Merge branch 'master' into nc-2107-permissioning-config-toml-file
macfarla Jan 29, 2019
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
Prev Previous commit
Next Next commit
handle when default permissions config file does not exist
macfarla committed Jan 25, 2019
commit b9dce8fc2e719266bb6b3baaba319befd94e0764
Original file line number Diff line number Diff line change
@@ -742,7 +742,7 @@ private PermissioningConfiguration permissioningConfiguration() {
return PermissioningConfiguration.createDefault();
}

final PermissioningConfiguration permissioningConfiguration =
final PermissioningConfiguration permissioningConfiguration =
PermissioningConfigurationBuilder.permissioningConfigurationFromToml(
DefaultCommandValues.PERMISSIONING_CONFIG_LOCATION,
permissionsNodesEnabled,