feat: upgrate messager type def

filecoin-project · Aug 23, 2022 · 660c34f · 660c34f
1 parent 20122cc
commit 660c34f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 33 deletions.
diff --git a/venus-devtool/api-gen/example.go b/venus-devtool/api-gen/example.go
@@ -226,8 +226,6 @@ func init() {
 		Receipt:     ExampleValue("init", reflect.TypeOf(&types.MessageReceipt{}), nil).(*types.MessageReceipt),
 		TipSetKey:   tsk,
 		Meta:        ExampleValue("init", reflect.TypeOf(&messager.SendSpec{}), nil).(*messager.SendSpec),
-		WalletName:  "test",
-		FromUser:    "test",
 		State:       messager.UnFillMsg,
 	})
 	addExample(ExampleValue("init", reflect.TypeOf(&messager.SendSpec{}), nil).(*messager.SendSpec))

diff --git a/venus-shared/api/messager/method.md b/venus-shared/api/messager/method.md
@@ -209,8 +209,6 @@ Response:
     "maxFee": "0",
     "gasOverPremium": 12.3
   },
-  "WalletName": "test",
-  "FromUser": "test",
   "State": 1,
   "CreatedAt": "0001-01-01T00:00:00Z",
   "UpdatedAt": "0001-01-01T00:00:00Z"
@@ -276,8 +274,6 @@ Response:
     "maxFee": "0",
     "gasOverPremium": 12.3
   },
-  "WalletName": "test",
-  "FromUser": "test",
   "State": 1,
   "CreatedAt": "0001-01-01T00:00:00Z",
   "UpdatedAt": "0001-01-01T00:00:00Z"
@@ -341,8 +337,6 @@ Response:
     "maxFee": "0",
     "gasOverPremium": 12.3
   },
-  "WalletName": "test",
-  "FromUser": "test",
   "State": 1,
   "CreatedAt": "0001-01-01T00:00:00Z",
   "UpdatedAt": "0001-01-01T00:00:00Z"
@@ -408,8 +402,6 @@ Response:
     "maxFee": "0",
     "gasOverPremium": 12.3
   },
-  "WalletName": "test",
-  "FromUser": "test",
   "State": 1,
   "CreatedAt": "0001-01-01T00:00:00Z",
   "UpdatedAt": "0001-01-01T00:00:00Z"
@@ -587,8 +579,6 @@ Response:
       "maxFee": "0",
       "gasOverPremium": 12.3
     },
-    "WalletName": "test",
-    "FromUser": "test",
     "State": 1,
     "CreatedAt": "0001-01-01T00:00:00Z",
     "UpdatedAt": "0001-01-01T00:00:00Z"
@@ -649,8 +639,6 @@ Response:
       "maxFee": "0",
       "gasOverPremium": 12.3
     },
-    "WalletName": "test",
-    "FromUser": "test",
     "State": 1,
     "CreatedAt": "0001-01-01T00:00:00Z",
     "UpdatedAt": "0001-01-01T00:00:00Z"
@@ -711,8 +699,6 @@ Response:
       "maxFee": "0",
       "gasOverPremium": 12.3
     },
-    "WalletName": "test",
-    "FromUser": "test",
     "State": 1,
     "CreatedAt": "0001-01-01T00:00:00Z",
     "UpdatedAt": "0001-01-01T00:00:00Z"
@@ -778,8 +764,6 @@ Response:
       "maxFee": "0",
       "gasOverPremium": 12.3
     },
-    "WalletName": "test",
-    "FromUser": "test",
     "State": 1,
     "CreatedAt": "0001-01-01T00:00:00Z",
     "UpdatedAt": "0001-01-01T00:00:00Z"
@@ -849,8 +833,6 @@ Response:
       "maxFee": "0",
       "gasOverPremium": 12.3
     },
-    "WalletName": "test",
-    "FromUser": "test",
     "State": 1,
     "CreatedAt": "0001-01-01T00:00:00Z",
     "UpdatedAt": "0001-01-01T00:00:00Z"
@@ -1139,7 +1121,6 @@ Inputs:
     "To": "f01234",
     "From": "f01234",
     "Val": "0",
-    "Account": "string value",
     "GasPremium": "0",
     "GasFeeCap": "0",
     "GasLimit": 10000,
@@ -1347,8 +1328,6 @@ Response:
     "maxFee": "0",
     "gasOverPremium": 12.3
   },
-  "WalletName": "test",
-  "FromUser": "test",
   "State": 1,
   "CreatedAt": "0001-01-01T00:00:00Z",
   "UpdatedAt": "0001-01-01T00:00:00Z"

diff --git a/venus-shared/types/messager/message.go b/venus-shared/types/messager/message.go
@@ -78,8 +78,6 @@ type Message struct {
 	Receipt    *shared.MessageReceipt
 	TipSetKey  shared.TipSetKey
 	Meta       *SendSpec
-	WalletName string
-	FromUser   string
 
 	State MessageState
 
@@ -114,8 +112,6 @@ func (m *Message) MarshalJSON() ([]byte, error) {
 		Receipt    *shared.MessageReceipt
 		TipSetKey  shared.TipSetKey
 		Meta       *SendSpec
-		WalletName string
-		FromUser   string
 
 		State MessageState
 
@@ -144,8 +140,6 @@ func (m *Message) MarshalJSON() ([]byte, error) {
 		Receipt:    m.Receipt,
 		TipSetKey:  m.TipSetKey,
 		Meta:       m.Meta,
-		WalletName: m.WalletName,
-		FromUser:   m.FromUser,
 		State:      m.State,
 		CreatedAt:  m.CreatedAt,
 		UpdatedAt:  m.UpdatedAt,

diff --git a/venus-shared/types/messager/quick_send.go b/venus-shared/types/messager/quick_send.go
@@ -13,10 +13,9 @@ const (
 )
 
 type QuickSendParams struct {
-	To      address.Address
-	From    address.Address
-	Val     abi.TokenAmount
-	Account string
+	To   address.Address
+	From address.Address
+	Val  abi.TokenAmount
 
 	GasPremium *abi.TokenAmount
 	GasFeeCap  *abi.TokenAmount