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
No related branches found
No related tags found
No related merge requests found
...@@ -13,7 +13,7 @@ import ( ...@@ -13,7 +13,7 @@ import (
// region public api /////////////////////////////////////////////////////////////////////////////////////////////////// // 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 cacheResult := transactionCache.ComputeIfAbsent(transactionHash, func() interface{} {
if transaction, dbErr := getTransactionFromDatabase(transactionHash); dbErr != nil { if transaction, dbErr := getTransactionFromDatabase(transactionHash); dbErr != nil {
err = dbErr err = dbErr
...@@ -35,7 +35,7 @@ func GetTransaction(transactionHash ternary.Trinary, computeIfAbsent ...func(ter ...@@ -35,7 +35,7 @@ func GetTransaction(transactionHash ternary.Trinary, computeIfAbsent ...func(ter
return 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) { if transactionCache.Contains(transactionHash) {
result = true result = true
} else { } else {
...@@ -97,7 +97,7 @@ func storeTransactionInDatabase(transaction *value_transaction.ValueTransaction) ...@@ -97,7 +97,7 @@ func storeTransactionInDatabase(transaction *value_transaction.ValueTransaction)
return nil 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()) txData, err := transactionDatabase.Get(transactionHash.CastToBytes())
if err != nil { if err != nil {
if err == badger.ErrKeyNotFound { if err == badger.ErrKeyNotFound {
...@@ -110,7 +110,7 @@ func getTransactionFromDatabase(transactionHash ternary.Trinary) (*value_transac ...@@ -110,7 +110,7 @@ func getTransactionFromDatabase(transactionHash ternary.Trinary) (*value_transac
return value_transaction.FromBytes(txData), nil 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 { if contains, err := transactionDatabase.Contains(transactionHash.CastToBytes()); err != nil {
return contains, ErrDatabaseError.Derive(err, "failed to check if the transaction exists") return contains, ErrDatabaseError.Derive(err, "failed to check if the transaction exists")
} else { } else {
......
...@@ -13,7 +13,7 @@ import ( ...@@ -13,7 +13,7 @@ import (
// region public api /////////////////////////////////////////////////////////////////////////////////////////////////// // 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 cacheResult := transactionMetadataCache.ComputeIfAbsent(transactionHash, func() interface{} {
if transactionMetadata, dbErr := getTransactionMetadataFromDatabase(transactionHash); dbErr != nil { if transactionMetadata, dbErr := getTransactionMetadataFromDatabase(transactionHash); dbErr != nil {
err = dbErr err = dbErr
...@@ -35,7 +35,7 @@ func GetTransactionMetadata(transactionHash ternary.Trinary, computeIfAbsent ... ...@@ -35,7 +35,7 @@ func GetTransactionMetadata(transactionHash ternary.Trinary, computeIfAbsent ...
return 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) { if transactionMetadataCache.Contains(transactionHash) {
result = true result = true
} else { } else {
...@@ -101,7 +101,7 @@ func storeTransactionMetadataInDatabase(metadata *transactionmetadata.Transactio ...@@ -101,7 +101,7 @@ func storeTransactionMetadataInDatabase(metadata *transactionmetadata.Transactio
return nil 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()) txMetadata, err := transactionMetadataDatabase.Get(transactionHash.CastToBytes())
if err != nil { if err != nil {
if err == badger.ErrKeyNotFound { if err == badger.ErrKeyNotFound {
...@@ -119,7 +119,7 @@ func getTransactionMetadataFromDatabase(transactionHash ternary.Trinary) (*trans ...@@ -119,7 +119,7 @@ func getTransactionMetadataFromDatabase(transactionHash ternary.Trinary) (*trans
return &result, nil 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 { if contains, err := transactionMetadataDatabase.Contains(transactionHash.CastToBytes()); err != nil {
return contains, ErrDatabaseError.Derive(err, "failed to check if the transaction metadata exists") return contains, ErrDatabaseError.Derive(err, "failed to check if the transaction metadata exists")
} else { } else {
......
...@@ -8,9 +8,9 @@ import ( ...@@ -8,9 +8,9 @@ import (
var tips = datastructure.NewRandomMap() var tips = datastructure.NewRandomMap()
func GetRandomTip() (result ternary.Trinary) { func GetRandomTip() (result ternary.Trytes) {
if randomTipHash := tips.RandomEntry(); randomTipHash != nil { if randomTipHash := tips.RandomEntry(); randomTipHash != nil {
result = randomTipHash.(ternary.Trinary) result = randomTipHash.(ternary.Trytes)
} else { } else {
result = meta_transaction.BRANCH_NULL_HASH result = meta_transaction.BRANCH_NULL_HASH
} }
......
...@@ -30,6 +30,6 @@ func Handler(c echo.Context) error { ...@@ -30,6 +30,6 @@ func Handler(c echo.Context) error {
type webResponse struct { type webResponse struct {
Duration int64 `json:"duration"` Duration int64 `json:"duration"`
BranchTransaction ternary.Trinary `json:"branchTransaction"` BranchTransaction ternary.Trytes `json:"branchTransaction"`
TrunkTransaction ternary.Trinary `json:"trunkTransaction"` 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