Merged in fix_bin_null (pull request #619)

Fix bug: bin is null Approved-by: wangzhang <wangzhang@cryptape.com> Approved-by: raowenbo <wbrao@cryptape.com> Approved-by: kaikaifeng <kaikai@cryptape.com> Approved-by: zhangyaning <u2@cryptape.com>
citahub · Jan 29, 2018 · 3effa47 · 3effa47
2 parents a8de348 + 62627ac
commit 3effa47
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/scripts/admintool/create_genesis.py b/scripts/admintool/create_genesis.py
@@ -8,6 +8,7 @@
 from os import path
 import binascii
 import hashlib
+import sys
 
 from ethereum.tools.tester import (Chain, get_env)
 from ethereum.tools._solidity import (
@@ -49,6 +50,10 @@ def init_contracts(nodes):
             extra = (ct.encode_constructor_arguments([nodes[address]]) if nodes[address] else b'')
         else:
             extra = (ct.encode_constructor_arguments([nodes[address][0], nodes[address][1]]) if nodes[address] else b'')
+
+        if ('' == simple_data['bin']):
+            sys.exit()
+
         print(binascii.hexlify(simple_data['bin'] + extra))
         abi_address = tester_state.contract(simple_data['bin'] + extra, language='evm', startgas=30000000)
         tester_state.mine()
@@ -116,4 +121,4 @@ def main():
         json.dump(data, f, indent=4)
 
 if __name__ == '__main__':
-    main()
+    main()
diff --git a/scripts/contracts/permission/permission_sys_interface.sol b/scripts/contracts/permission/permission_sys_interface.sol
@@ -29,7 +29,7 @@ pragma solidity ^0.4.18;
  * f5ff3f20: queryBasicPermission()
  * 152db21e: queryGroupInfo(bytes32)
  * 95b771dc: queryGroups(address)
- * af7c5ed6: queryParentGroup(bytes32)
+ * 5257a658: queryParentGroup(bytes32)
  * 626b04a2: queryPermissions(bytes32)
  * 5ec62af2: queryProfile(bytes32)
  * 620bb3ca: queryRoles(bytes32)

diff --git a/scripts/contracts/permission/permission_system.sol b/scripts/contracts/permission/permission_system.sol
@@ -376,7 +376,7 @@ contract PermissionSystem is PermissionSysInterface, PermissionCheck {
     }
 
     /// @dev Query the parentGroup of the group
-    function queryParentGroups(bytes32 _group)
+    function queryParentGroup(bytes32 _group)
         view
         public
         returns (bytes32)