[twin] tesuite for twin into own crate (#306)

Co-authored-by: xyz <xyz>
Co-authored-by: 0o-de-lally <[email protected]>

.cargo/config.toml

@@ -1,7 +1,7 @@
 [env]
 # set coin name for diem dependencies
-RUST_DIEM_COIN_MODULE = "gas_coin"
-RUST_DIEM_COIN_NAME = "LibraCoin"
+RUST_DIEM_COIN_MODULE="libra_coin"
+RUST_DIEM_COIN_NAME="LibraCoin"
 
 [target.'cfg(target_os = "linux")']
 # Dramatically increases the link performance for the eventbus

.github/workflows/ci.yaml

@@ -238,6 +238,12 @@ jobs:
         run: |
           echo "Main last commit has [breaking]: ${{ env.hasBreakingCommit }}"
 
+      - name: delete fixtures and force rebuild
+        working-directory: ./framework/src/upgrade_fixtures/fixtures
+        run: |
+          rm -rf upgrade-*
+          RUST_MIN_STACK=104857600 cargo t -- make_the_upgrade_fixtures --include-ignored
+
       - name: upgrade - check workflow
         if: always()
         working-directory: ./upgrade-tests
@@ -289,3 +295,20 @@ jobs:
         working-directory: ./tools/storage
         # TODO: not testing the V6 file parsing
         run: cargo test --no-fail-fast e2e_
+
+  twin-testsuite:
+    timeout-minutes: 60
+    needs: [build-framework]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: setup env
+        uses: ./.github/actions/build_env
+
+      - uses: Swatinem/[email protected]
+        with:
+          shared-key: "libra-framework"
+          cache-all-crates: true
+      - name: twin
+        working-directory: ./testsuites/twin
+        run: cargo test --no-fail-fast

.gitignore

@@ -13,8 +13,8 @@ Cargo.lock
 **/build
 **/doc
 **/framework_upgrade
-# upgrade fixtures
-**/framework/src/upgrade_fixtures/fixtures/upgrade*
+# # upgrade fixtures
+# **/framework/src/upgrade_fixtures/fixtures/upgrade*
 
 sccache.log
 
@@ -28,4 +28,4 @@ diem/
 
 # exclude move coverage
 .coverage_map.mvcov
-.trace
+.trace

Cargo.toml

@@ -5,6 +5,7 @@ members = [
   "framework",
   "framework/cached-packages",
   "smoke-tests",
+  "testsuites/twin",
   "tools/cli",
   "tools/config",
   "tools/genesis",
@@ -41,6 +42,7 @@ libra-rescue = { path = "tools/rescue" }
 libra-storage = { path = "tools/storage" }
 libra-smoke-tests = { path = "smoke-tests" }
 libra-tower = { path = "tools/tower" }
+libra-twin-tests = { path = "testsuites/twin" }
 libra-types = { path = "types" }
 libra-txs = { path = "tools/txs" }
 libra-wallet = { path = "tools/wallet" }

framework/libra-framework/sources/diem_governance.move

@@ -542,11 +542,6 @@ module diem_framework::diem_governance {
 
     // COMMIT NOTE: trigger_epoch() should now work on Stage as well.
 
-    // /// Return the voting power
-    // fun get_voting_power(_pool_address: address): u64 {
-    //     1
-    // }
-
     #[view]
     public fun get_next_governance_proposal_id():u64 {
       voting::get_next_proposal_id<GovernanceProposal>(@diem_framework)

framework/src/release.rs

@@ -8,7 +8,7 @@ use diem_framework::{
 };
 use move_command_line_common::address::NumericalAddress;
 use once_cell::sync::Lazy;
-use std::{collections::BTreeMap, fmt::Display, path::PathBuf, str::FromStr};
+use std::{collections::BTreeMap, env, fmt::Display, path::PathBuf, str::FromStr};
 
 use crate::BYTECODE_VERSION;
 
@@ -90,13 +90,26 @@ impl ReleaseTarget {
     }
 
     pub fn create_release_options(self, dev_mode: bool, out: Option<PathBuf>) -> ReleaseOptions {
-        let crate_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+        // Get the path to source. If we are running tests in cargo we
+        // can assume cargo manifest dir.
+        // Otherwise we assume the tool is being run in the source path
+
+        let source_path = if let Ok(p) = env::var("CARGO_MANIFEST_DIR") {
+            println!("using Cargo project path: {}", &p);
+            PathBuf::from(p)
+        } else {
+            env::current_dir().expect("could not get local current_dir")
+        };
+
         // let crate_dir = crate_dir.parent().unwrap().to_path_buf();
         let packages = self
             .packages()
             .into_iter()
             .map(|(path, binding_path)| {
-                (crate_dir.join(path), binding_path.unwrap_or("").to_owned())
+                (
+                    source_path.join(path),
+                    binding_path.unwrap_or("").to_owned(),
+                )
             })
             .collect::<Vec<_>>();
         ReleaseOptions {
@@ -126,7 +139,7 @@ impl ReleaseTarget {
                 .into_iter()
                 .map(|(_, binding)| {
                     if !binding.is_empty() {
-                        crate_dir.join(binding).display().to_string()
+                        source_path.join(binding).display().to_string()
                     } else {
                         binding
                     }
@@ -136,7 +149,7 @@ impl ReleaseTarget {
                 path
             } else {
                 // Place in release directory //////// 0L ////////
-                crate_dir.join("releases/head.mrb")
+                source_path.join("releases/head.mrb")
             },
         }
     }

framework/src/upgrade_fixtures/fixtures/upgrade-multi-lib-force/1-move-stdlib/Move.toml

@@ -0,0 +1,13 @@
+[package]
+name = 'upgrade_scripts'
+version = '1.0.0'
+authors = []
+license = ''
+
+[addresses]
+
+[dev-addresses]
+[dependencies.LibraFramework]
+local = '/Users/lucas/code/rust/libra-framework/framework/libra-framework'
+
+[dev-dependencies]

framework/src/upgrade_fixtures/fixtures/upgrade-multi-lib-force/1-move-stdlib/script_sha3

@@ -0,0 +1 @@
+b7ed52a7612abd9bd633cb8c2f307b1316c39454f6753d3f8fe40f4f2f8bbdf9