From: Arik Sosman <git@arik.io>
Date: Wed, 27 Jan 2021 22:48:01 +0000 (-0800)
Subject: Merge branch 'master' of https://git.bitcoin.ninja/ldk-java into typescript_conversion
X-Git-Tag: v0.0.1~36
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=acecce750cf1159a51f9d1a4dbfd717520739e92;p=ldk-java

Merge branch 'master' of https://git.bitcoin.ninja/ldk-java into typescript_conversion


 Conflicts:

	typescript_strings.py
---

acecce750cf1159a51f9d1a4dbfd717520739e92
diff --cc typescript_strings.py
index 37aba59d,5820e0a6..b96340c0
--- a/typescript_strings.py
+++ b/typescript_strings.py
@@@ -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):