code improvements

controls/permission/permission.go

@@ -50,8 +50,8 @@ func ParsePermissionConifg(dir string) (types.PermissionConfig, error) {
 	fileName := "permission-config.json"
 	fullPath := filepath.Join(dir, fileName)
 	if _, err := os.Stat(fullPath); err != nil {
-		log.Error("permission-config.json file is missing", err)
-		return types.PermissionConfig{}, err
+		log.Warn("permission-config.json file is missing", err)
+		return types.PermissionConfig{}, nil
 	}
 
 	blob, err := ioutil.ReadFile(fullPath)
@@ -79,10 +79,10 @@ func NewQuorumPermissionCtrl(stack *node.Node, permissionedMode, isRaft bool, pc
 	}
 
 	var permissionContractAddress common.Address
-	if pconfig.ContractAddress != "" {
-		permissionContractAddress = common.HexToAddress(pconfig.ContractAddress)
-	} else {
+	if pconfig.IsEmpty() {
 		permissionContractAddress = params.QuorumPermissionsContract
+	} else {
+		permissionContractAddress = common.HexToAddress(pconfig.ContractAddress)
 	}
 	// check if permissioning contract is there at address. If not return from here
 	pm, err := pbind.NewPermissions(permissionContractAddress, stateReader)

core/quorum/api.go

@@ -211,10 +211,10 @@ func (p *QuorumControlsAPI) Init(ethClnt *ethclient.Client, key *ecdsa.PrivateKe
 	p.ethClnt = ethClnt
 	if apiName == "quorumNodeMgmt" || apiName == "quorumAcctMgmt" {
 		var contractAddress common.Address
-		if pconfig.ContractAddress != "" {
-			contractAddress = common.HexToAddress(pconfig.ContractAddress)
-		} else {
+		if pconfig.IsEmpty() {
 			contractAddress = params.QuorumPermissionsContract
+		} else {
+			contractAddress = common.HexToAddress(pconfig.ContractAddress)
 		}
 		permContr, err := pbind.NewPermissions(contractAddress, p.ethClnt)
 		if err != nil {

core/types/permissions_cache.go

@@ -41,6 +41,10 @@ var OrgKeyMap, _ = lru.New(orgKeyMapLimit)
 
 var orgKeyLock sync.Mutex
 
+func (pc *PermissionConfig) IsEmpty() bool {
+	return pc.ContractAddress == ""
+}
+
 // sets default access to ReadOnly
 func SetDefaultAccess() {
 	DefaultAccess = FullAccess //TODO to be changed to readOnly