mirror of https://github.com/poanetwork/quorum.git
fatal error if a node joins permissioned network in non permissioned mode
This commit is contained in:
parent
9eaace0990
commit
4bcae7bd9b
|
@ -62,7 +62,8 @@ func NewKeyedTransactor(key *ecdsa.PrivateKey) *TransactOpts {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
// NewWalletTransactor is a utility method to easily create a transaction signer
|
||||
// from a wallet account
|
||||
func NewWalletTransactor(w accounts.Wallet, from accounts.Account) *TransactOpts {
|
||||
return &TransactOpts{
|
||||
From: from.Address,
|
||||
|
|
|
@ -426,7 +426,7 @@ func (p *PermissionCtrl) populateInitPermission() error {
|
|||
if tx && !p.permissionedMode {
|
||||
// Network is initialized with permissions and node is joining in a non-permissioned
|
||||
// option. stop the node from coming up
|
||||
types.SetDefaultAccess()
|
||||
utils.Fatalf("Joining a permissioned network in non-permissioned mode. Bring up get with --permissioned.")
|
||||
}
|
||||
|
||||
if !p.permissionedMode{
|
||||
|
|
|
@ -48,12 +48,12 @@ func GetAcctAccess(acctId common.Address) AccessType {
|
|||
return vo.AcctAccess
|
||||
}
|
||||
}
|
||||
return DefaultAccess
|
||||
// if AcctMap.Len() == 0 {
|
||||
// return FullAccess
|
||||
// } else {
|
||||
// return ReadOnly
|
||||
// }
|
||||
// return DefaultAccess
|
||||
if AcctMap.Len() == 0 {
|
||||
return FullAccess
|
||||
} else {
|
||||
return ReadOnly
|
||||
}
|
||||
}
|
||||
|
||||
func AddOrgKey(orgId string, key string) {
|
||||
|
|
Loading…
Reference in New Issue