Commit b4113f16 authored by Yury's avatar Yury
Browse files

update vendor. Update common module. Message: 1....

update vendor. Update common module. Message: 1. GetUserPreferenceArrayByKeysWithFilter -> GetPreferenceArrayByKeysWithFilter
2. удалил GetUserPreferenceArrayByKeysWithFilterFunction
3. IUserPreferenceRemoteManager - GetUserPreferenceArrayByKeysWithFilter -> GetPreferenceArrayByKeysWithFilter
Showing with 13 additions and 11 deletions
+13 -11
package transactionCC
import (
"gitlab.smartblocklab.com/smartcontracts/common/nums"
"fmt"
"encoding/json"
"errors"
"gitlab.smartblocklab.com/smartcontracts/common/model/accountCC"
"fmt"
"gitlab.smartblocklab.com/smartcontracts/common/chaincode"
"encoding/json"
"reflect"
"gitlab.smartblocklab.com/smartcontracts/common/invoke"
"gitlab.smartblocklab.com/smartcontracts/common/model/accountCC"
"gitlab.smartblocklab.com/smartcontracts/common/model/preferenceCC"
"gitlab.smartblocklab.com/smartcontracts/common/model/requests"
"gitlab.smartblocklab.com/smartcontracts/common/remote/remote_systempreference"
"strconv"
"gitlab.smartblocklab.com/smartcontracts/common/model/systempreferenceCC"
"gitlab.smartblocklab.com/smartcontracts/common/model/userCC"
"gitlab.smartblocklab.com/smartcontracts/common/nums"
"gitlab.smartblocklab.com/smartcontracts/common/remote/remote_account"
"gitlab.smartblocklab.com/smartcontracts/common/remote/remote_systempreference"
"gitlab.smartblocklab.com/smartcontracts/common/remote/remote_user"
"gitlab.smartblocklab.com/smartcontracts/common/model/userCC"
"gitlab.smartblocklab.com/smartcontracts/common/model/systempreferenceCC"
"gitlab.smartblocklab.com/smartcontracts/common/model/preferenceCC"
"reflect"
"strconv"
)
// TransactionRecord transaction struct which denotes transaction
......@@ -34,6 +34,8 @@ type TransactionRecord struct {
DependencyKey string `json:"dependency_key,omitempty"` // transaction dependency in a form of "txnType.currencyType.accountId"
Timestamp Timestamp `json:"timestamp"`
InOutType InputOutputType `json:"input_output_type"`
FromUserAccountInfo *accountCC.UserAccountInfo `json:"from_user_account_info,omitempty"` // Информационное поле на него нельзя завязывать никакой бизнеслогики
ToUserAccountInfo *accountCC.UserAccountInfo `json:"to_user_account_info,omitempty"` // Информационное поле на него нельзя завязывать никакой бизнеслогики
}
func (this TransactionRecord) GetObjectType() string {
......
......@@ -183,7 +183,7 @@
"revisionTime": "2019-02-21T12:43:59Z"
},
{
"checksumSHA1": "79PF+AR0qAAgpE1K4aRWzE7cs4Q=",
"checksumSHA1": "WwZOxJqjGAjKSp0I8gWQoXv4/TE=",
"path": "gitlab.smartblocklab.com/smartcontracts/common/model/transactionCC",
"revision": "58734d014cfcc8a0c562b452c3469d9bee87af91",
"revisionTime": "2019-02-21T12:43:59Z"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment