]> git.bitcoin.ninja Git - ldk-java/commitdiff
Merge branch 'master' of https://git.bitcoin.ninja/ldk-java into typescript_conversion
authorArik Sosman <git@arik.io>
Wed, 27 Jan 2021 22:48:01 +0000 (14:48 -0800)
committerArik Sosman <git@arik.io>
Wed, 27 Jan 2021 22:48:01 +0000 (14:48 -0800)
\ 1 Conflicts:
\ 1 typescript_strings.py

1  2 
typescript_strings.py

index 37aba59d595f96d5fe88cb37d807b40aae665a56,5820e0a6424dba2154608ca83bfd7be225729899..b96340c04e1a5c223e7cd89ac0a3ed14ace741ce
@@@ -367,12 -370,10 +381,12 @@@ const decodeString = (stringPointer, fr
  
      return result;
  };
 -"""
 +
 +
 +            """
          return ''
  
-     def init_str(self, c_array_class_caches):
+     def init_str(self):
          return ""
  
      def native_c_unitary_enum_map(self, struct_name, variants):