Merge pull request #6329 from johndebord/master

EOSIO.CDT test porting/contract refactor
EOSIO · Jan 3, 2019 · 7894fd5 · 7894fd5
2 parents 0826164 + 2bdb512
commit 7894fd5
Show file tree

Hide file tree

Showing 276 changed files with 8,784 additions and 22,915 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,9 +3,9 @@
 *.dylib
 *.ll
 *.bc
+*.wasm
 *.wast
 *.wast.hpp
-*.wasm
 *.s
 *.dot
 *.abi.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -229,7 +229,6 @@ message( STATUS "Using '${EOSIO_ROOT_KEY}' as public key for 'eosio' account" )
 
 include(wasm)
 add_subdirectory( libraries )
-add_subdirectory( contracts )
 add_subdirectory( plugins )
 add_subdirectory( programs )
 add_subdirectory( scripts )

diff --git a/contracts/CMakeLists.txt b/contracts/CMakeLists.txt
diff --git a/contracts/asserter/CMakeLists.txt b/contracts/asserter/CMakeLists.txt
diff --git a/contracts/asserter/asserter.cpp b/contracts/asserter/asserter.cpp
diff --git a/contracts/eosio.bios/CMakeLists.txt b/contracts/eosio.bios/CMakeLists.txt
diff --git a/contracts/eosio.bios/eosio.bios.abi b/contracts/eosio.bios/eosio.bios.abi
diff --git a/contracts/eosio.bios/eosio.bios.cpp b/contracts/eosio.bios/eosio.bios.cpp
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,9 +3,9 @@ @@
     *.dylib
     *.ll
     *.bc
+    *.wasm
     *.wast
     *.wast.hpp
-    *.wasm
     *.s
     *.dot
     *.abi.hpp
@@ Expand Down @@