Improve migration (#41)

* eth-connector: update `migrate` method * Remove proofs from migration * Remove `account_storage_usage` * Fix ci * Update eth connector mock contract
aurora-is-near · Apr 15, 2024 · 1856ffb · 1856ffb
1 parent 1d883cd
commit 1856ffb
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml
@@ -40,6 +40,6 @@ jobs:
           cache-util save cargo_git cargo_registry
 
 env:
-  RUST_VERSION: 1.73.0
+  RUST_VERSION: 1.74.1
   CARGO_TERM_COLOR: always
   CARGO_INCREMENTAL: 0
diff --git a/eth-connector/src/contract.rs b/eth-connector/src/contract.rs
@@ -218,8 +218,8 @@ impl EthConnectorContract {
         CallDeposit::call(&self.contract).args_borsh(raw_proof)
     }
 
-    pub fn migrate(&self, data: MigrationInputData) -> CallMigrate {
-        CallMigrate::call(&self.contract).args_borsh(data)
+    pub fn migrate(&self, accounts: Vec<String>) -> CallMigrate {
+        CallMigrate::call(&self.contract).args_borsh(accounts)
     }
 
     pub fn set_aurora_engine_account_id(&self, account_id: String) -> CallSetAuroraEngineAccountId {

diff --git a/eth-connector/src/types.rs b/eth-connector/src/types.rs
@@ -9,8 +9,6 @@ use std::collections::HashMap;
 pub struct MigrationInputData {
     pub accounts: HashMap<AccountId, Balance>,
     pub total_supply: Option<Balance>,
-    pub account_storage_usage: Option<StorageUsage>,
-    pub used_proofs: Vec<String>,
 }
 
 #[derive(Debug, BorshSerialize, BorshDeserialize, Eq, PartialEq)]
@@ -21,7 +19,6 @@ pub enum MigrationCheckResult {
     TotalSupply(Balance),
     StorageUsage(StorageUsage),
     StatisticsCounter(u64),
-    Proof(Vec<String>),
 }
 
 #[derive(Debug, Default, Serialize, Deserialize, BorshDeserialize, BorshSerialize, Clone)]

diff --git a/eth-connector/tests/fungible_token_tests.rs b/eth-connector/tests/fungible_token_tests.rs
@@ -388,8 +388,13 @@ async fn test_deposit() {
 #[tokio::test]
 async fn test_migrate() {
     let contract = deploy_and_init().await.unwrap();
-    let data = MigrationInputData::default();
-    contract.migrate(data).max_gas().transact().await.unwrap();
+    let accounts = vec![];
+    contract
+        .migrate(accounts)
+        .max_gas()
+        .transact()
+        .await
+        .unwrap();
 }
 
 #[tokio::test]

diff --git a/res/mock_eth_connector/src/lib.rs b/res/mock_eth_connector/src/lib.rs
@@ -311,7 +311,7 @@ impl StorageManagement for EthConnectorContract {
 impl Migration for EthConnectorContract {
     /// Migrate contract data
     #[private]
-    fn migrate(&mut self, #[serializer(borsh)] data: MigrationInputData) {}
+    fn migrate(&mut self, #[serializer(borsh)] accounts: Vec<AccountId>) {}
 
     #[result_serializer(borsh)]
     fn check_migration_correctness(

diff --git a/res/mock_eth_connector/src/migration.rs b/res/mock_eth_connector/src/migration.rs
@@ -6,8 +6,6 @@ use std::collections::HashMap;
 pub struct MigrationInputData {
     pub accounts: HashMap<AccountId, Balance>,
     pub total_supply: Option<Balance>,
-    pub account_storage_usage: Option<StorageUsage>,
-    pub used_proofs: Vec<String>,
 }
 
 #[derive(Debug, BorshSerialize, BorshDeserialize, Eq, PartialEq)]
@@ -18,12 +16,11 @@ pub enum MigrationCheckResult {
     TotalSupply(Balance),
     StorageUsage(StorageUsage),
     StatisticsCounter(u64),
-    Proof(Vec<String>),
 }
 
 #[ext_contract(ext_deposit)]
 pub trait Migration {
-    fn migrate(&mut self, #[serializer(borsh)] data: MigrationInputData);
+    fn migrate(&mut self, #[serializer(borsh)] accounts: Vec<AccountId>);
 
     #[result_serializer(borsh)]
     fn check_migration_correctness(