remove starcoin_dao.rs, update starcoin-framework, update halley gene…

…sis (#3840) * remove starcoin_dao.rs, update starcoin-framework, update halley genesis * fix test use ignore
starcoinorg · Feb 2, 2023 · cc57e47 · cc57e47
1 parent b5788d6
commit cc57e47
Show file tree

Hide file tree

Showing 323 changed files with 280 additions and 288 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -425,7 +425,7 @@ starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev
 starcoin-decrypt = { path = "commons/decrypt" }
 starcoin-dev = { path = "vm/dev" }
 starcoin-executor = { path = "executor" }
-starcoin-framework = { git = "https://github.com/starcoinorg/starcoin-framework", rev = "e618173d44fb4e57b8c735cb3eda6844de22d930" }
+starcoin-framework = { git = "https://github.com/starcoinorg/starcoin-framework", rev = "cf1deda180af40a8b3e26c0c7b548c4c290cd7e7" }
 starcoin-genesis = { path = "genesis" }
 starcoin-logger = { path = "commons/logger" }
 starcoin-metrics = { path = "commons/metrics" }

diff --git a/executor/Cargo.toml b/executor/Cargo.toml
@@ -30,7 +30,6 @@ stest = { workspace = true }
 tempfile = { workspace = true }
 test-helper = { workspace = true }
 move-transactional-test-runner = { workspace = true }
-move-binary-format = { workspace = true }
 
 [features]
 default = []

diff --git a/executor/tests/error_code_test.rs b/executor/tests/error_code_test.rs
@@ -182,7 +182,7 @@ fn test_execute_transfer_txn_with_dummy_gas_token_code() -> Result<()> {
     let output = execute_and_apply(&chain_state, txn2);
     //FIXME:: More detailed error code
     assert_eq!(
-        TransactionStatus::Discard(StatusCode::UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION),
+        TransactionStatus::Discard(StatusCode::BAD_TRANSACTION_FEE_CURRENCY),
         *output.status()
     );