Skip to content
Snippets Groups Projects
Commit 276ed127 authored by Hans Moog's avatar Hans Moog
Browse files

Refactor: renamed trinary to trytes (wolfgang was angry about it)

parent c30efe38
Branches
No related tags found
No related merge requests found
......@@ -13,7 +13,7 @@ import (
// region public api ///////////////////////////////////////////////////////////////////////////////////////////////////
func GetTransaction(transactionHash ternary.Trinary, computeIfAbsent ...func(ternary.Trinary) *value_transaction.ValueTransaction) (result *value_transaction.ValueTransaction, err errors.IdentifiableError) {
func GetTransaction(transactionHash ternary.Trytes, computeIfAbsent ...func(ternary.Trytes) *value_transaction.ValueTransaction) (result *value_transaction.ValueTransaction, err errors.IdentifiableError) {
if cacheResult := transactionCache.ComputeIfAbsent(transactionHash, func() interface{} {
if transaction, dbErr := getTransactionFromDatabase(transactionHash); dbErr != nil {
err = dbErr
......@@ -35,7 +35,7 @@ func GetTransaction(transactionHash ternary.Trinary, computeIfAbsent ...func(ter
return
}
func ContainsTransaction(transactionHash ternary.Trinary) (result bool, err errors.IdentifiableError) {
func ContainsTransaction(transactionHash ternary.Trytes) (result bool, err errors.IdentifiableError) {
if transactionCache.Contains(transactionHash) {
result = true
} else {
......@@ -97,7 +97,7 @@ func storeTransactionInDatabase(transaction *value_transaction.ValueTransaction)
return nil
}
func getTransactionFromDatabase(transactionHash ternary.Trinary) (*value_transaction.ValueTransaction, errors.IdentifiableError) {
func getTransactionFromDatabase(transactionHash ternary.Trytes) (*value_transaction.ValueTransaction, errors.IdentifiableError) {
txData, err := transactionDatabase.Get(transactionHash.CastToBytes())
if err != nil {
if err == badger.ErrKeyNotFound {
......@@ -110,7 +110,7 @@ func getTransactionFromDatabase(transactionHash ternary.Trinary) (*value_transac
return value_transaction.FromBytes(txData), nil
}
func databaseContainsTransaction(transactionHash ternary.Trinary) (bool, errors.IdentifiableError) {
func databaseContainsTransaction(transactionHash ternary.Trytes) (bool, errors.IdentifiableError) {
if contains, err := transactionDatabase.Contains(transactionHash.CastToBytes()); err != nil {
return contains, ErrDatabaseError.Derive(err, "failed to check if the transaction exists")
} else {
......
......@@ -13,7 +13,7 @@ import (
// region public api ///////////////////////////////////////////////////////////////////////////////////////////////////
func GetTransactionMetadata(transactionHash ternary.Trinary, computeIfAbsent ...func(ternary.Trinary) *transactionmetadata.TransactionMetadata) (result *transactionmetadata.TransactionMetadata, err errors.IdentifiableError) {
func GetTransactionMetadata(transactionHash ternary.Trytes, computeIfAbsent ...func(ternary.Trytes) *transactionmetadata.TransactionMetadata) (result *transactionmetadata.TransactionMetadata, err errors.IdentifiableError) {
if cacheResult := transactionMetadataCache.ComputeIfAbsent(transactionHash, func() interface{} {
if transactionMetadata, dbErr := getTransactionMetadataFromDatabase(transactionHash); dbErr != nil {
err = dbErr
......@@ -35,7 +35,7 @@ func GetTransactionMetadata(transactionHash ternary.Trinary, computeIfAbsent ...
return
}
func ContainsTransactionMetadata(transactionHash ternary.Trinary) (result bool, err errors.IdentifiableError) {
func ContainsTransactionMetadata(transactionHash ternary.Trytes) (result bool, err errors.IdentifiableError) {
if transactionMetadataCache.Contains(transactionHash) {
result = true
} else {
......@@ -101,7 +101,7 @@ func storeTransactionMetadataInDatabase(metadata *transactionmetadata.Transactio
return nil
}
func getTransactionMetadataFromDatabase(transactionHash ternary.Trinary) (*transactionmetadata.TransactionMetadata, errors.IdentifiableError) {
func getTransactionMetadataFromDatabase(transactionHash ternary.Trytes) (*transactionmetadata.TransactionMetadata, errors.IdentifiableError) {
txMetadata, err := transactionMetadataDatabase.Get(transactionHash.CastToBytes())
if err != nil {
if err == badger.ErrKeyNotFound {
......@@ -119,7 +119,7 @@ func getTransactionMetadataFromDatabase(transactionHash ternary.Trinary) (*trans
return &result, nil
}
func databaseContainsTransactionMetadata(transactionHash ternary.Trinary) (bool, errors.IdentifiableError) {
func databaseContainsTransactionMetadata(transactionHash ternary.Trytes) (bool, errors.IdentifiableError) {
if contains, err := transactionMetadataDatabase.Contains(transactionHash.CastToBytes()); err != nil {
return contains, ErrDatabaseError.Derive(err, "failed to check if the transaction metadata exists")
} else {
......
......@@ -8,9 +8,9 @@ import (
var tips = datastructure.NewRandomMap()
func GetRandomTip() (result ternary.Trinary) {
func GetRandomTip() (result ternary.Trytes) {
if randomTipHash := tips.RandomEntry(); randomTipHash != nil {
result = randomTipHash.(ternary.Trinary)
result = randomTipHash.(ternary.Trytes)
} else {
result = meta_transaction.BRANCH_NULL_HASH
}
......
......@@ -30,6 +30,6 @@ func Handler(c echo.Context) error {
type webResponse struct {
Duration int64 `json:"duration"`
BranchTransaction ternary.Trinary `json:"branchTransaction"`
TrunkTransaction ternary.Trinary `json:"trunkTransaction"`
BranchTransaction ternary.Trytes `json:"branchTransaction"`
TrunkTransaction ternary.Trytes `json:"trunkTransaction"`
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment