fix proxy test contract to work even after NO_DUPLICATE_DEFERRED_ID a…

…ctivation #6115
EOSIO · Apr 4, 2019 · 3633119 · 3633119
1 parent 324260d
commit 3633119
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/unittests/test-contracts/README.md b/unittests/test-contracts/README.md
@@ -2,6 +2,6 @@ test_ram_limit contract was compiled with eosio.cdt v1.4.1
 
 That contract was ported to compile with eosio.cdt v1.5.0, but the test that uses it is very sensitive to stdlib/eosiolib changes, compilation flags and linker flags.
 
-deferred_test contract was compiled with eosio.cdt v1.6.1
+deferred_test and proxy contracts were compiled with eosio.cdt v1.6.1
 
 The remaining contracts have been ported to compile with eosio.cdt v1.6.x. They were compiled with a patched version of eosio.cdt v1.6.0-rc1 (commit 1c9180ff5a1e431385180ce459e11e6a1255c1a4).
diff --git a/unittests/test-contracts/proxy/proxy.cpp b/unittests/test-contracts/proxy/proxy.cpp
@@ -59,6 +59,7 @@ void proxy::on_error( uint128_t sender_id, eosio::ignore<std::vector<char>> ) {
    get_datastream() >> packed_trx_size;
    transaction trx;
    get_datastream() >> trx;
+   trx.transaction_extensions.clear();
 
    trx.delay_sec = cfg.delay;
    trx.send( id, get_self() );

diff --git a/unittests/test-contracts/proxy/proxy.wasm b/unittests/test-contracts/proxy/proxy.wasm