embed contracts required for native contract unit testing in to libtester #680
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
spoonincode
commented
Jul 15, 2022
| @@ -4,10 +4,13 @@ configure_file(contracts.hpp.in include/testing_contracts/contracts.hpp ESCAPE_Q | |||
| add_library(eosio_testing_contracts INTERFACE) | |||
| target_include_directories(eosio_testing_contracts INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/include/testing_contracts) | |||
|
|
|||
| configure_file(contracts.cpp.in contracts.cpp ESCAPE_QUOTES) | |||
There was a problem hiding this comment.
There is a defect here. contracts.cpp depends on the various wasm/abi files it embeds and the build system is oblivious to that. Unfortunately attaching proper dependencies is going to require some reorganization due to these wasm/abi files being placed in to CMAKE_BINARY_DIR via unittests/contracts, which is currently executed after libraries/testing. I don't have a low touch fix for the reorg required to properly fix.
heifner
approved these changes
Jul 16, 2022
larryk85
approved these changes
Jul 18, 2022
Base automatically changed from
eosio_tester_install_fixups_31x
to
release/3.1.x
July 19, 2022 17:00
…ter_contracts_31x
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For native contract unit testing, libtester potentially needs to
setcodea few bios contracts at run time on the chain driving unit tests. Previously, when libtester needed these contracts it would load them from the absolute path of which mandel was built. But after amake dev-installof mandel it's possible the build directory has been removed. And for the mandel-dev.deb package the build directory never even existed on the target.For these few bios contracts bundle them inside of libtester so that there is no need to read them from disk. This allows libtester to access them after being installed from mandel-dev.deb, for example. I was attempting to minimize code changes in this PR; I think maybe some items should be rearranged further as commented on.
Resolves #642. Work on #639.
Picks up eosnetworkfoundation/mandel-fc#46 where I moved incbin.h in to fc (and updated to latest version) (also we're seeing more fc changes picked up in this PR because a few things are stacked up...)