diff --git a/account_balance_query.go b/account_balance_query.go index e4fb356f0..e3b5e524d 100644 --- a/account_balance_query.go +++ b/account_balance_query.go @@ -26,6 +26,7 @@ func NewAccountBalanceQuery() *AccountBalanceQuery { pb: &pb, } } + // SetAccountID sets the AccountID for which you wish to query the balance. // // Note: you can only query an Account or Contract but not both -- if a Contract ID or Account ID has already been set, diff --git a/contract_info_query.go b/contract_info_query.go index 5807fad3a..73ce1344d 100644 --- a/contract_info_query.go +++ b/contract_info_query.go @@ -79,7 +79,6 @@ func (query *ContractInfoQuery) Execute(client *Client) (ContractInfo, error) { return ContractInfo{}, err } - resp, err := execute( client, request{ @@ -108,13 +107,13 @@ func (query *ContractInfoQuery) Execute(client *Client) (ContractInfo, error) { AccountID: accountIDFromProtobuf(resp.query.GetContractGetInfo().ContractInfo.AccountID), ContractID: contractIDFromProtobuf(resp.query.GetContractGetInfo().ContractInfo.ContractID), ContractAccountID: resp.query.GetContractGetInfo().ContractInfo.ContractAccountID, - AdminKey: PublicKey{ + AdminKey: PublicKey{ keyData: adminKey.toProtoKey().GetEd25519(), }, - ExpirationTime: timeFromProtobuf(resp.query.GetContractGetInfo().ContractInfo.ExpirationTime), - AutoRenewPeriod: durationFromProtobuf(resp.query.GetContractGetInfo().ContractInfo.AutoRenewPeriod), - Storage: uint64(resp.query.GetContractGetInfo().ContractInfo.Storage), - ContractMemo: resp.query.GetContractGetInfo().ContractInfo.Memo, + ExpirationTime: timeFromProtobuf(resp.query.GetContractGetInfo().ContractInfo.ExpirationTime), + AutoRenewPeriod: durationFromProtobuf(resp.query.GetContractGetInfo().ContractInfo.AutoRenewPeriod), + Storage: uint64(resp.query.GetContractGetInfo().ContractInfo.Storage), + ContractMemo: resp.query.GetContractGetInfo().ContractInfo.Memo, }, nil } diff --git a/contract_records_query.go b/contract_records_query.go index c3e60d4b2..d041d4d12 100644 --- a/contract_records_query.go +++ b/contract_records_query.go @@ -67,7 +67,6 @@ func (query *ContractRecordsQuery) Execute(client *Client) ([]TransactionRecord, return []TransactionRecord{}, err } - resp, err := execute( client, request{ diff --git a/file_contents_query.go b/file_contents_query.go index f6d7ec7cc..13839f332 100644 --- a/file_contents_query.go +++ b/file_contents_query.go @@ -66,7 +66,6 @@ func (query *FileContentsQuery) Execute(client *Client) ([]byte, error) { return []byte{}, err } - resp, err := execute( client, request{ @@ -104,4 +103,3 @@ func (query *FileContentsQuery) SetNodeAccountID(accountID AccountID) *FileConte func (query *FileContentsQuery) GetNodeAccountId() AccountID { return query.Query.GetNodeAccountId() } - diff --git a/file_info.go b/file_info.go index ac41c4ec7..b231035dd 100644 --- a/file_info.go +++ b/file_info.go @@ -55,14 +55,14 @@ func (fileInfo *FileInfo) toProtobuf() *proto.FileGetInfoResponse_FileInfo { } return &proto.FileGetInfoResponse_FileInfo{ - FileID: fileInfo.FileID.toProtobuf(), - Size: fileInfo.Size, + FileID: fileInfo.FileID.toProtobuf(), + Size: fileInfo.Size, ExpirationTime: &proto.Timestamp{ Seconds: int64(fileInfo.ExpirationTime.Second()), Nanos: int32(fileInfo.ExpirationTime.Nanosecond()), }, - Deleted: fileInfo.IsDeleted, - Keys: &proto.KeyList{ + Deleted: fileInfo.IsDeleted, + Keys: &proto.KeyList{ Keys: keys, }, } diff --git a/file_info_query.go b/file_info_query.go index 4e3f50ff9..1fd205cc2 100644 --- a/file_info_query.go +++ b/file_info_query.go @@ -64,7 +64,6 @@ func (query *FileInfoQuery) Execute(client *Client) (FileInfo, error) { return FileInfo{}, err } - resp, err := execute( client, request{ diff --git a/live_hash.go b/live_hash.go index 04e6cb2e1..874c58869 100644 --- a/live_hash.go +++ b/live_hash.go @@ -7,9 +7,9 @@ import ( type LiveHash struct { AccountID AccountID - Hash []byte - Keys KeyList - Duration time.Time + Hash []byte + Keys KeyList + Duration time.Time } func newLiveHash(accountId AccountID, hash []byte, @@ -27,7 +27,7 @@ func (liveHash *LiveHash) toProtobuf() *proto.LiveHash { AccountId: liveHash.AccountID.toProtobuf(), Hash: liveHash.Hash, Keys: liveHash.Keys.toProtoKeyList(), - Duration: &proto.Duration{ + Duration: &proto.Duration{ Seconds: int64(liveHash.Duration.Second()), }, } @@ -38,9 +38,9 @@ func liveHashFromProtobuf(hash *proto.LiveHash) LiveHash { AccountID: accountIDFromProtobuf(hash.GetAccountId()), Hash: hash.Hash, Keys: keyListFromProtobuf(hash.Keys), - Duration: time.Date(time.Now().Year(), time.Now().Month(), - time.Now().Day(), time.Now().Hour(), time.Now().Minute(), - int(hash.Duration.Seconds), time.Now().Nanosecond(), time.Now().Location()), + Duration: time.Date(time.Now().Year(), time.Now().Month(), + time.Now().Day(), time.Now().Hour(), time.Now().Minute(), + int(hash.Duration.Seconds), time.Now().Nanosecond(), time.Now().Location()), } } diff --git a/live_hash_query.go b/live_hash_query.go index 2c8067298..8065ced8b 100644 --- a/live_hash_query.go +++ b/live_hash_query.go @@ -73,7 +73,6 @@ func (query *LiveHashQuery) Execute(client *Client) (LiveHash, error) { return LiveHash{}, err } - resp, err := execute( client, request{ diff --git a/network_version_info_query.go b/network_version_info_query.go index 823286b6a..0784fa06f 100644 --- a/network_version_info_query.go +++ b/network_version_info_query.go @@ -53,7 +53,6 @@ func (query *NetworkVersionInfoQuery) Execute(client *Client) (NetworkVersionInf return NetworkVersionInfo{}, err } - resp, err := execute( client, request{ diff --git a/topic_info.go b/topic_info.go index c22b32daf..22f155a59 100644 --- a/topic_info.go +++ b/topic_info.go @@ -18,19 +18,19 @@ type TopicInfo struct { func topicInfoFromProtobuf(topicInfo *proto.ConsensusTopicInfo) TopicInfo { return TopicInfo{ - Memo: topicInfo.Memo, - RunningHash: topicInfo.RunningHash, - SequenceNumber: topicInfo.SequenceNumber, - ExpirationTime: time.Date(time.Now().Year(), time.Now().Month(), time.Now().Day(), - time.Now().Hour(), time.Now().Minute(), int(topicInfo.ExpirationTime.Seconds), - int(topicInfo.ExpirationTime.Nanos), time.Now().Location()), - AdminKey: &PublicKey{ + Memo: topicInfo.Memo, + RunningHash: topicInfo.RunningHash, + SequenceNumber: topicInfo.SequenceNumber, + ExpirationTime: time.Date(time.Now().Year(), time.Now().Month(), time.Now().Day(), + time.Now().Hour(), time.Now().Minute(), int(topicInfo.ExpirationTime.Seconds), + int(topicInfo.ExpirationTime.Nanos), time.Now().Location()), + AdminKey: &PublicKey{ keyData: topicInfo.AdminKey.GetEd25519(), }, - SubmitKey: &PublicKey{ + SubmitKey: &PublicKey{ keyData: topicInfo.SubmitKey.GetEd25519(), }, - AutoRenewPeriod: durationFromProtobuf(topicInfo.AutoRenewPeriod), + AutoRenewPeriod: durationFromProtobuf(topicInfo.AutoRenewPeriod), AutoRenewAccountID: &AccountID{ Shard: uint64(topicInfo.GetAutoRenewAccount().ShardNum), Realm: uint64(topicInfo.GetAutoRenewAccount().RealmNum), @@ -41,10 +41,10 @@ func topicInfoFromProtobuf(topicInfo *proto.ConsensusTopicInfo) TopicInfo { func (topicInfo *TopicInfo) toProtobuf() *proto.ConsensusTopicInfo { return &proto.ConsensusTopicInfo{ - Memo: topicInfo.Memo, - RunningHash: topicInfo.RunningHash, - SequenceNumber: topicInfo.SequenceNumber, - ExpirationTime: &proto.Timestamp{ + Memo: topicInfo.Memo, + RunningHash: topicInfo.RunningHash, + SequenceNumber: topicInfo.SequenceNumber, + ExpirationTime: &proto.Timestamp{ Seconds: int64(topicInfo.ExpirationTime.Second()), Nanos: int32(topicInfo.ExpirationTime.Nanosecond()), }, diff --git a/topic_info_query.go b/topic_info_query.go index ada6abc3f..7cf7b11be 100644 --- a/topic_info_query.go +++ b/topic_info_query.go @@ -54,7 +54,6 @@ func (query *TopicInfoQuery) Execute(client *Client) (TopicInfo, error) { return TopicInfo{}, err } - resp, err := execute( client, request{