Merge pull request #7143 from EOSIO/fix-tests-in-forced-replay

fix tests in forced-replay branch; use updated bios contract
EOSIO · Apr 17, 2019 · 6affbf6 · 6affbf6
2 parents 2376bde + 37df54e
commit 6affbf6
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/libraries/testing/tester.cpp b/libraries/testing/tester.cpp
@@ -983,7 +983,7 @@ namespace eosio { namespace testing {
 
    void base_tester::preactivate_protocol_features(const vector<digest_type> feature_digests) {
       for( const auto& feature_digest: feature_digests ) {
-         push_action( config::system_account_name, N(preactivate), config::system_account_name,
+         push_action( config::system_account_name, N(activate), config::system_account_name,
                       fc::mutable_variant_object()("feature_digest", feature_digest) );
       }
    }

diff --git a/testnet.template b/testnet.template
@@ -87,7 +87,7 @@ ecmd set contract eosio $bioscontractpath eosio.bios.wasm eosio.bios.abi
 # Preactivate all digests
 for digest in $FEATURE_DIGESTS;
 do
-ecmd push action eosio preactivate "{\"feature_digest\":\"$digest\"}" -p eosio
+ecmd push action eosio activate "{\"feature_digest\":\"$digest\"}" -p eosio
 done
 
 # Create required system accounts

diff --git a/tests/Cluster.py b/tests/Cluster.py
@@ -1212,7 +1212,7 @@ def bootstrap(self, biosNode, totalNodes, prodCount, totalProducers, pfSetupPoli
         contract=eosioTokenAccount.name
         Utils.Print("push create action to %s contract" % (contract))
         action="create"
-        data="{\"issuer\":\"%s\",\"maximum_supply\":\"1000000000.0000 %s\",\"can_freeze\":\"0\",\"can_recall\":\"0\",\"can_whitelist\":\"0\"}" % (eosioTokenAccount.name, CORE_SYMBOL)
+        data="{\"issuer\":\"%s\",\"maximum_supply\":\"1000000000.0000 %s\"}" % (eosioAccount.name, CORE_SYMBOL)
         opts="--permission %s@active" % (contract)
         trans=biosNode.pushMessage(contract, action, data, opts)
         if trans is None or not trans[0]:
@@ -1229,7 +1229,7 @@ def bootstrap(self, biosNode, totalNodes, prodCount, totalProducers, pfSetupPoli
         Utils.Print("push issue action to %s contract" % (contract))
         action="issue"
         data="{\"to\":\"%s\",\"quantity\":\"1000000000.0000 %s\",\"memo\":\"initial issue\"}" % (eosioAccount.name, CORE_SYMBOL)
-        opts="--permission %s@active" % (contract)
+        opts="--permission %s@active" % (eosioAccount.name)
         trans=biosNode.pushMessage(contract, action, data, opts)
         if trans is None or not trans[0]:
             Utils.Print("ERROR: Failed to push issue action to eosio contract.")

diff --git a/tests/Node.py b/tests/Node.py
@@ -1539,10 +1539,10 @@ def getAllBuiltinFeatureDigestsToPreactivate(self):
     # Require PREACTIVATE_FEATURE to be activated and require eosio.bios with preactivate_feature
     def preactivateProtocolFeatures(self, featureDigests:list):
         for digest in featureDigests:
-            Utils.Print("push preactivate action with digest {}".format(digest))
+            Utils.Print("push activate action with digest {}".format(digest))
             data="{{\"feature_digest\":{}}}".format(digest)
             opts="--permission eosio@active"
-            trans=self.pushMessage("eosio", "preactivate", data, opts)
+            trans=self.pushMessage("eosio", "activate", data, opts)
             if trans is None or not trans[0]:
                 Utils.Print("ERROR: Failed to preactive digest {}".format(digest))
                 return None

diff --git a/unittests/contracts/eosio.bios/eosio.bios.abi b/unittests/contracts/eosio.bios/eosio.bios.abi
@@ -17,6 +17,16 @@
                 }
             ]
         },
+        {
+            "name": "activate",
+            "base": "",
+            "fields": [
+                {
+                    "name": "feature_digest",
+                    "type": "checksum256"
+                }
+            ]
+        },
         {
             "name": "authority",
             "base": "",
@@ -241,16 +251,6 @@
                 }
             ]
         },
-        {
-            "name": "preactivate",
-            "base": "",
-            "fields": [
-                {
-                    "name": "feature_digest",
-                    "type": "checksum256"
-                }
-            ]
-        },
         {
             "name": "producer_key",
             "base": "",
@@ -451,6 +451,11 @@
         }
     ],
     "actions": [
+        {
+            "name": "activate",
+            "type": "activate",
+            "ricardian_contract": ""
+        },
         {
             "name": "canceldelay",
             "type": "canceldelay",
@@ -476,11 +481,6 @@
             "type": "onerror",
             "ricardian_contract": ""
         },
-        {
-            "name": "preactivate",
-            "type": "preactivate",
-            "ricardian_contract": ""
-        },
         {
             "name": "reqactivated",
             "type": "reqactivated",

diff --git a/unittests/contracts/eosio.bios/eosio.bios.wasm b/unittests/contracts/eosio.bios/eosio.bios.wasm
diff --git a/unittests/protocol_feature_tests.cpp b/unittests/protocol_feature_tests.cpp
@@ -111,7 +111,7 @@ BOOST_AUTO_TEST_CASE( double_preactivation ) try {
    auto d = pfm.get_builtin_digest( builtin_protocol_feature_t::only_link_to_existing_permission );
    BOOST_REQUIRE( d );
 
-   c.push_action( config::system_account_name, N(preactivate), config::system_account_name,
+   c.push_action( config::system_account_name, N(activate), config::system_account_name,
                   fc::mutable_variant_object()("feature_digest", *d), 10 );
 
    std::string expected_error_msg("protocol feature with digest '");
@@ -122,7 +122,7 @@ BOOST_AUTO_TEST_CASE( double_preactivation ) try {
       expected_error_msg += "' is already pre-activated";
    }
 
-   BOOST_CHECK_EXCEPTION(  c.push_action( config::system_account_name, N(preactivate), config::system_account_name,
+   BOOST_CHECK_EXCEPTION(  c.push_action( config::system_account_name, N(activate), config::system_account_name,
                                           fc::mutable_variant_object()("feature_digest", *d), 20 ),
                            protocol_feature_exception,
                            fc_exception_message_is( expected_error_msg )