Skip to content
This repository has been archived by the owner on Jun 7, 2023. It is now read-only.

Commit

Permalink
Delete entangled submodule
Browse files Browse the repository at this point in the history
Focus on using CCurl library primarly.
  • Loading branch information
lzpap committed Oct 7, 2019
1 parent eb7f919 commit dafc7be
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 22 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion entangled
Submodule entangled deleted from 475bcb
2 changes: 1 addition & 1 deletion examples/with_ccurl.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]

Expand Down
2 changes: 1 addition & 1 deletion examples/with_entangled.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]

Expand Down
15 changes: 2 additions & 13 deletions init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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..."
2 changes: 1 addition & 1 deletion pow/ccurl_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion pow/entangled_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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']},
)

0 comments on commit dafc7be

Please sign in to comment.