Merge PR cosmos#79: ICS 25: Handler interface

Makefile

@@ -1,4 +1,4 @@
-SUBDIRS := spec/ics-3-connection-semantics spec/ics-4-channel-and-packet-semantics
+SUBDIRS := spec/ics-003-connection-semantics spec/ics-004-channel-and-packet-semantics
 TOPTARGETS := all clean
 
 $(TOPTARGETS): $(SUBDIRS)

scripts/check_links.py

@@ -21,7 +21,7 @@
             sys.exit(1)
     titles = [int(x[0]) for x in title_regex.findall(data)]
     for num in titles:
-        matched = [f for f in files if f[7:7+4+len(str(num))+1] == 'ics-' + str(num) + '-']
+        matched = [f for f in files if f[7:7+4+len(str(num).zfill(3))+1] == 'ics-' + str(num).zfill(3) + '-']
         if len(matched) > 0:
             print('Expected "ICS {}" to link to {} but not found!'.format(num, matched[0]))
             sys.exit(1)

spec/ics-002-consensus-verification/README.md

@@ -47,7 +47,7 @@ as long as associated light client algorithms fulfilling the requirements are pr
   verified state roots which can be utilized by downstream logic to verify subcomponents
   of state at particular heights.
 
-* `createClient`, `queryClient`, `updateClient`, `freezeClient`, and `deleteClient` function signatures are as defined in ICS 25.
+* `createClient`, `queryClient`, `updateClient`, `freezeClient`, and `deleteClient` function signatures are as defined in [ICS 25](../ics-025-handler-interface).
   The function implementations are defined in this standard.
 
 ### Desired Properties

spec/ics-003-connection-semantics/README.md

@@ -3,8 +3,16 @@ ics: 3
 title: Connection Semantics
 stage: draft
 category: ibc-core
+<<<<<<< HEAD
+requires: 23, 24
+required-by: 25
+=======
 requires: 2, 23, 24
+<<<<<<< HEAD:spec/ics-3-connection-semantics/README.md
+>>>>>>> master
+=======
 required-by: 4
+>>>>>>> master:spec/ics-003-connection-semantics/README.md
 author: Christopher Goes <[email protected]>, Juwoon Yun <[email protected]>
 created: 2019-03-07
 modified: 2019-05-17

spec/ics-004-channel-and-packet-semantics/README.md

@@ -361,16 +361,6 @@ function chanCloseInit(
 The `chanCloseTry` function is called by the handshake-accepting module
 to acknowledge the channel close request and continue the closing process.
 
-```typescript
-interface ChanCloseTry {
-  connectionIdentifier: Identifier
-  channelIdentifier: Identifier
-  timeoutHeight: uint64
-  nextTimeoutHeight: uint64
-  proofInit: CommitmentProof
-}
-```
-
 ```typescript
 function chanCloseTry(
   connectionIdentifier: Identifier, channelIdentifier: Identifier,