[move] remove framework bloat (#209)

Co-authored-by: 0o-de-lally <1364012+0o-de-lally@users.noreply.github.com>
0LNetworkCommunity · Mar 12, 2024 · 8ce78e3 · 8ce78e3
1 parent 4035750
commit 8ce78e3
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 5 deletions.
diff --git a/framework/libra-framework/sources/modified_source/account.move b/framework/libra-framework/sources/modified_source/account.move
@@ -18,15 +18,19 @@ module diem_framework::account {
 
     // use diem_std::debug::print;
 
-    #[test_only]
-    friend diem_framework::diem_account;
     friend diem_framework::coin;
     friend diem_framework::genesis;
-    friend diem_framework::resource_account;
     friend diem_framework::transaction_validation;
     //////// 0L ////////
     friend ol_framework::ol_account;
     friend diem_framework::multisig_account;
+
+    #[test_only]
+    friend diem_framework::diem_account;
+
+    friend diem_framework::resource_account;
+    //////// end 0L ////////
+
     /// Resource representing an account.
     struct Account has key, store {
         authentication_key: vector<u8>,

diff --git a/...urces/modified_specs_only/block.spec.move → ...ource/modified_specs_only/block.spec.move b/...urces/modified_specs_only/block.spec.move → ...ource/modified_specs_only/block.spec.move
diff --git a/...ied_specs_only/consensus_config.spec.move → ...ied_specs_only/consensus_config.spec.move b/...ied_specs_only/consensus_config.spec.move → ...ied_specs_only/consensus_config.spec.move
diff --git a/...odified_specs_only/gas_schedule.spec.move → ...odified_specs_only/gas_schedule.spec.move b/...odified_specs_only/gas_schedule.spec.move → ...odified_specs_only/gas_schedule.spec.move
diff --git a/...ces/modified_specs_only/version.spec.move → ...rce/modified_specs_only/version.spec.move b/...ces/modified_specs_only/version.spec.move → ...rce/modified_specs_only/version.spec.move
diff --git a/...libra-framework/sources/diem_account.move → ...dified_source/test_only/diem_account.move b/...libra-framework/sources/diem_account.move → ...dified_source/test_only/diem_account.move
diff --git a/...-framework/sources/diem_account.spec.move → ...d_source/test_only/diem_account.spec.move b/...-framework/sources/diem_account.spec.move → ...d_source/test_only/diem_account.spec.move
diff --git a/...bra-framework/sources/diem_coin.spec.move → ...source/test_only/diem_coin.spec.move.depr b/...bra-framework/sources/diem_coin.spec.move → ...source/test_only/diem_coin.spec.move.depr
diff --git a/...rk/libra-framework/sources/diem_coin.move → ...source/test_only/diem_coin_test_only.move b/...rk/libra-framework/sources/diem_coin.move → ...source/test_only/diem_coin_test_only.move
diff --git a/...mework/sources/resource_account.spec.move → ...test_only/resource_account.spec.move.depr b/...mework/sources/resource_account.spec.move → ...test_only/resource_account.spec.move.depr
diff --git a/...a-framework/sources/resource_account.move → ...test_only/resource_account_test_only.move b/...a-framework/sources/resource_account.move → ...test_only/resource_account_test_only.move
@@ -1,3 +1,4 @@
+
 /// A resource account is used to manage resources independent of an account managed by a user.
 /// This contains several utilities to make using resource accounts more effective.
 ///
@@ -58,6 +59,7 @@
 ///    module.resource_signer_cap = option::some(resource_signer_cap);
 /// }
 /// ```
+
 module diem_framework::resource_account {
     use std::error;
     use std::signer;

diff --git a/framework/libra-framework/sources/ol_sources/gas_coin.spec.move b/framework/libra-framework/sources/ol_sources/gas_coin.spec.move
@@ -1,4 +1,4 @@
-spec diem_framework::diem_coin {
+spec diem_framework::diem_coin  {
     spec module {
         pragma verify = true;
         pragma aborts_if_is_strict;
@@ -8,7 +8,7 @@ spec diem_framework::diem_coin {
         pragma aborts_if_is_partial;
         let addr = signer::address_of(diem_framework);
         ensures exists<MintCapStore>(addr);
-        ensures exists<coin::CoinInfo<DiemCoin>>(addr);
+        ensures exists<coin::CoinInfo<GasCoin>>(addr);
     }
 
     spec destroy_mint_cap {

diff --git a/framework/releases/release-6.9.6.mrb b/framework/releases/release-6.9.6.mrb