Call exported authenticate method from PSD (#829)

Co-authored-by: zenground0 <ZenGround0@users.noreply.github.com>
filecoin-project · Nov 17, 2022 · d2cf652 · d2cf652
1 parent 6caea40
commit d2cf652
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/actors/account/tests/account_actor_test.rs b/actors/account/tests/account_actor_test.rs
@@ -103,7 +103,7 @@ fn authenticate_message() {
     });
     assert_eq!(
         RawBytes::default(),
-        rt.call::<AccountActor>(Method::AuthenticateMessage as MethodNum, &params).unwrap()
+        rt.call::<AccountActor>(Method::AuthenticateMessageExported as MethodNum, &params).unwrap()
     );
     rt.verify();
 
@@ -118,7 +118,7 @@ fn authenticate_message() {
     expect_abort_contains_message(
         ExitCode::USR_ILLEGAL_ARGUMENT,
         "bad signature",
-        rt.call::<AccountActor>(Method::AuthenticateMessage as MethodNum, &params),
+        rt.call::<AccountActor>(Method::AuthenticateMessageExported as MethodNum, &params),
     );
     rt.verify();
 

diff --git a/actors/market/src/ext.rs b/actors/market/src/ext.rs
@@ -10,7 +10,8 @@ use fvm_shared::smooth::FilterEstimate;
 pub mod account {
     use super::*;
 
-    pub const AUTHENTICATE_MESSAGE_METHOD: u64 = 3;
+    pub const AUTHENTICATE_MESSAGE_METHOD: u64 =
+        frc42_dispatch::method_hash!("AuthenticateMessage");
 
     #[derive(Serialize_tuple, Deserialize_tuple)]
     pub struct AuthenticateMessageParams {

diff --git a/test_vm/src/util.rs b/test_vm/src/util.rs
@@ -1130,7 +1130,7 @@ pub fn market_publish_deal(
         },
         ExpectInvocation {
             to: deal_client,
-            method: AccountMethod::AuthenticateMessage as u64,
+            method: AccountMethod::AuthenticateMessageExported as u64,
             ..Default::default()
         },
     ];

diff --git a/test_vm/tests/account_authenticate_message_test.rs b/test_vm/tests/account_authenticate_message_test.rs
@@ -1,5 +1,5 @@
 use fil_actor_account::types::AuthenticateMessageParams;
-use fil_actor_account::Method::AuthenticateMessage;
+use fil_actor_account::Method::AuthenticateMessageExported;
 use fvm_ipld_blockstore::MemoryBlockstore;
 use fvm_ipld_encoding::RawBytes;
 use fvm_shared::bigint::Zero;
@@ -32,7 +32,7 @@ fn account_authenticate_message() {
         addr,
         addr,
         TokenAmount::zero(),
-        AuthenticateMessage as u64,
+        AuthenticateMessageExported as u64,
         authenticate_message_params,
     );
 
@@ -44,7 +44,7 @@ fn account_authenticate_message() {
         addr,
         addr,
         TokenAmount::zero(),
-        AuthenticateMessage as u64,
+        AuthenticateMessageExported as u64,
         authenticate_message_params,
         ExitCode::USR_ILLEGAL_ARGUMENT,
     );

diff --git a/test_vm/tests/publish_deals_test.rs b/test_vm/tests/publish_deals_test.rs
@@ -553,7 +553,7 @@ fn psd_bad_sig() {
             },
             ExpectInvocation {
                 to: a.client1,
-                method: AccountMethod::AuthenticateMessage as u64,
+                method: AccountMethod::AuthenticateMessageExported as u64,
                 params: Some(
                     serialize(
                         &AuthenticateMessageParams {