From dafc7bee14216311341a01d78479b1cd0f3358f5 Mon Sep 17 00:00:00 2001
From: Levente Pap <levente.pap@iota.org>
Date: Mon, 7 Oct 2019 15:23:57 +0200
Subject: [PATCH] Delete entangled submodule

Focus on using CCurl library primarly.
---
 .gitmodules                |  3 ---
 entangled                  |  1 -
 examples/with_ccurl.py     |  2 +-
 examples/with_entangled.py |  2 +-
 init.sh                    | 15 ++-------------
 pow/ccurl_interface.py     |  2 +-
 pow/entangled_interface.py |  2 +-
 setup.py                   |  2 +-
 8 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 160000 entangled

diff --git a/.gitmodules b/.gitmodules
index 39230dc..8737ea8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "ccurl"]
 	path = ccurl
 	url = https://github.com/iotaledger/ccurl.git
-[submodule "entangled"]
-	path = entangled
-	url = https://github.com/iotaledger/entangled.git
diff --git a/entangled b/entangled
deleted file mode 160000
index 475bcb3..0000000
--- a/entangled
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 475bcb3dca9c211950277a755df7385c36877575
diff --git a/examples/with_ccurl.py b/examples/with_ccurl.py
index a29d1b3..6e88e39 100644
--- a/examples/with_ccurl.py
+++ b/examples/with_ccurl.py
@@ -44,7 +44,7 @@
 
 mwm = 14 # target is mainnet
 
-bundle = ccurl_interface.local_attach_to_tangle(pb, gta['trunkTransaction'], gta['branchTransaction'], mwm)
+bundle = ccurl_interface.attach_to_tangle(pb, gta['trunkTransaction'], gta['branchTransaction'], mwm)
 
 bundle_trytes = [ x.as_tryte_string() for x in pb._transactions ]
 
diff --git a/examples/with_entangled.py b/examples/with_entangled.py
index a7cfa5a..b3bf5ec 100644
--- a/examples/with_entangled.py
+++ b/examples/with_entangled.py
@@ -44,7 +44,7 @@
 
 mwm = 14 # target is mainnet
 
-bundle = entangled_interface.local_attach_to_tangle(pb, gta['branchTransaction'],gta['trunkTransaction'],  mwm)
+bundle = entangled_interface.attach_to_tangle(pb, gta['branchTransaction'],gta['trunkTransaction'],  mwm)
 
 bundle_trytes = [ x.as_tryte_string() for x in pb._transactions ]
 
diff --git a/init.sh b/init.sh
index 2a01c7d..452a02f 100755
--- a/init.sh
+++ b/init.sh
@@ -4,7 +4,7 @@
 git submodule update --init --recursive
 # Delete binaries if present
 rm -f pow/libccurl.so
-rm -f pow/helpers.dll
+#rm -f pow/helpers.dll
 # Get current working directory
 WD=$(pwd)
 
@@ -20,15 +20,4 @@ echo $LIB
 echo "Copying shared library file to the src directory..."
 cp $LIB $WD/pow
 
-echo "Done building CCurl binaries..."
-
-# Bulding using bazel
-echo "Building entangled/common/helpers library with bazel..."
-cd entangled
-bazel build //common/helpers:helpers.dll
-
-LIB="bazel-bin/common/helpers/helpers.dll"
-echo "Copying shared library file to the src directory..."
-cp $LIB $WD/pow
-
-echo "Done building entangled/common/helpers binaries..."
+echo "Done building CCurl binaries..."
\ No newline at end of file
diff --git a/pow/ccurl_interface.py b/pow/ccurl_interface.py
index 03cd194..e2c1510 100644
--- a/pow/ccurl_interface.py
+++ b/pow/ccurl_interface.py
@@ -17,7 +17,7 @@ def get_hash_trytes(trytes):
     return _libccurl.ccurl_digest_transaction(c_char_p(trytes.encode('utf-8')))
 
 # Takes a bundle object, calculates the pow, attaches tx hash
-def local_attach_to_tangle(bundle_trytes, # Iterable[txtrytes]
+def attach_to_tangle(bundle_trytes, # Iterable[txtrytes]
                         trunk_transaction_hash,
                         branch_transaction_hash,
                         mwm):
diff --git a/pow/entangled_interface.py b/pow/entangled_interface.py
index 22c7092..da7110e 100644
--- a/pow/entangled_interface.py
+++ b/pow/entangled_interface.py
@@ -18,7 +18,7 @@ def get_hash(trytes):
     return _libpow.iota_digest(c_char_p(trytes.encode('utf-8')))
 
 # Takes a bundle object, calculates the pow, attaches tx hash
-def local_attach_to_tangle(bundle_trytes,
+def attach_to_tangle(bundle_trytes,
                         branch_transaction_hash,
                         trunk_transaction_hash,
                         mwm):
diff --git a/setup.py b/setup.py
index 378b811..ff5b710 100644
--- a/setup.py
+++ b/setup.py
@@ -5,5 +5,5 @@
     version='1.0',
     packages=['pow'],
     package_dir={'pow': 'pow'},
-    package_data={'pow': ['helpers.dll','libccurl.so']},
+    package_data={'pow': ['libccurl.so']},
     )
\ No newline at end of file