fix missing pr

orbs-network · Oct 25, 2020 · 04f761f · 04f761f
1 parent a105146
commit 04f761f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/services/consensuscontext/create_transactions_block.go b/services/consensuscontext/create_transactions_block.go
@@ -9,7 +9,7 @@ package consensuscontext
 import (
 	"context"
 	"github.com/orbs-network/crypto-lib-go/crypto/digest"
-	config2 "github.com/orbs-network/orbs-network-go/config"
+    "github.com/orbs-network/orbs-network-go/config"
 	"github.com/orbs-network/orbs-network-go/services/processor/native/repository/Triggers"
 	"github.com/orbs-network/orbs-spec/types/go/primitives"
 	"github.com/orbs-network/orbs-spec/types/go/protocol"
@@ -121,7 +121,7 @@ func (s *service) fetchTransactions(ctx context.Context, blockProtocolVersion pr
 func (s *service) createTriggerTransaction(blockTime primitives.TimestampNano) *protocol.SignedTransaction {
 	return (&protocol.SignedTransactionBuilder{
 		Transaction: &protocol.TransactionBuilder{
-			ProtocolVersion: config2.MAXIMAL_CLIENT_PROTOCOL_VERSION,
+			ProtocolVersion: config.MAXIMAL_CLIENT_PROTOCOL_VERSION,
 			VirtualChainId:  s.config.VirtualChainId(),
 			Timestamp:       blockTime,
 			ContractName:    primitives.ContractName(triggers_systemcontract.CONTRACT_NAME),

diff --git a/services/transactionpool/validate_transaction.go b/services/transactionpool/validate_transaction.go
@@ -68,14 +68,14 @@ func (c *validationContext) ValidateTransactionForOrdering(transaction *protocol
 
 func (c *validationContext) validateAddTransactionProtocolVersion(transaction *protocol.SignedTransaction) *ErrTransactionRejected {
 	if transaction.Transaction().ProtocolVersion() > config.MAXIMAL_CLIENT_PROTOCOL_VERSION {
-		return &ErrTransactionRejected{protocol.TRANSACTION_STATUS_REJECTED_UNSUPPORTED_VERSION, log.Stringable("client-protocol-version", config.MAXIMAL_CLIENT_PROTOCOL_VERSION), log.Stringable("protocol-version", transaction.Transaction().ProtocolVersion())}
+		return &ErrTransactionRejected{protocol.TRANSACTION_STATUS_REJECTED_UNSUPPORTED_VERSION, log.Stringable("maxiaml client-protocol-version", config.MAXIMAL_CLIENT_PROTOCOL_VERSION), log.Stringable("actual client-protocol-version", transaction.Transaction().ProtocolVersion())}
 	}
 	return nil
 }
 
 func (c *validationContext) validateProtocolVersion(transaction *protocol.SignedTransaction) *ErrTransactionRejected {
 	if transaction.Transaction().ProtocolVersion() > config.MAXIMAL_CLIENT_PROTOCOL_VERSION {
-		return &ErrTransactionRejected{protocol.TRANSACTION_STATUS_REJECTED_UNSUPPORTED_VERSION, log.Stringable("client-protocol-version", config.MAXIMAL_CLIENT_PROTOCOL_VERSION), log.Stringable("protocol-version", transaction.Transaction().ProtocolVersion())}
+		return &ErrTransactionRejected{protocol.TRANSACTION_STATUS_REJECTED_UNSUPPORTED_VERSION, log.Stringable("maxiaml client-protocol-version", config.MAXIMAL_CLIENT_PROTOCOL_VERSION), log.Stringable("actual client-protocol-version", transaction.Transaction().ProtocolVersion())}
 	}
 	return nil
 }

diff --git a/test/builders/queries.go b/test/builders/queries.go
@@ -31,7 +31,7 @@ func GetBalanceQuery() *QueryBuilder {
 		signer: keyPair.PrivateKey(),
 		builder: &protocol.SignedQueryBuilder{
 			Query: &protocol.QueryBuilder{
-				ProtocolVersion: config.MAXIMAL_CONSENSUS_BLOCK_PROTOCOL_VERSION,
+				ProtocolVersion: config.MAXIMAL_CLIENT_PROTOCOL_VERSION,
 				VirtualChainId:  DEFAULT_TEST_VIRTUAL_CHAIN_ID,
 				ContractName:    "BenchmarkToken",
 				MethodName:      "getBalance",

diff --git a/test/builders/transaction_refs.go b/test/builders/transaction_refs.go
@@ -23,7 +23,7 @@ type transactionRef struct {
 func TransactionRef() *transactionRef {
 	return &transactionRef{
 		builder: &client.TransactionRefBuilder{
-			ProtocolVersion:      config.MAXIMAL_CONSENSUS_BLOCK_PROTOCOL_VERSION,
+			ProtocolVersion:      config.MAXIMAL_CLIENT_PROTOCOL_VERSION,
 			VirtualChainId:       DEFAULT_TEST_VIRTUAL_CHAIN_ID,
 			TransactionTimestamp: primitives.TimestampNano(time.Now().UnixNano()),
 			Txhash:               hash.CalcSha256([]byte("some-tx-hash")),