[rm_skycoin] refs skycoin#42. Fix merge issue. Update tests due to ne…

…w changes.
simelo · Jul 18, 2018 · 2ae8049 · 2ae8049
1 parent da8f3d1
commit 2ae8049
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -18,11 +18,7 @@ FULL_PATH_LIB = $(PWD)/$(BUILDLIBC_DIR)
 LIB_FILES = $(shell find $(SKYCOIN_DIR)/lib/cgo -type f -name "*.go")
 SRC_FILES = $(shell find $(SKYCOIN_DIR)/src -type f -name "*.go")
 SWIG_FILES = $(shell find $(LIBSWIG_DIR) -type f -name "*.i")
-<<<<<<< HEAD
-HEADER_FILES = $(shell find $(INCLUDE_DIR) -type f -name "*.h")
-=======
 HEADER_FILES = $(shell find $(SKYCOIN_DIR)/include -type f -name "*.h")
->>>>>>> skycoin/develop
 
 ifeq ($(shell uname -s),Linux)
 	TEMP_DIR = tmp

diff --git a/tests/test_simple.py b/tests/test_simple.py
@@ -68,7 +68,7 @@ def test_cipherAddress():
     address2 = skycoin.cipher__Address()
     error = skycoin.SKY_cipher_BitcoinAddressFromBytes(bytes, address2)
     assert error == 0
-    assert address.isEqual(address2)
+    assert address == address2
 
 
 
@@ -96,7 +96,7 @@ def test_GenerateKeyPairs():
     address2 = skycoin.cipher__Address()
     error = skycoin.SKY_cipher_DecodeBase58Address(address_string, address2)
     assert error == 0
-    assert address.isEqual(address2)
+    assert address == address2
 
 
 def test_GenerateDeterministicKeyPairs():