Skip to content

Commit

Permalink
naming
Browse files Browse the repository at this point in the history
  • Loading branch information
poly-rodr committed Nov 29, 2023
1 parent 0b917c3 commit 777932c
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 22 deletions.
24 changes: 12 additions & 12 deletions pkg/builder/exchange_order_builder_impl_test.go
Expand Up @@ -99,7 +99,7 @@ func TestBuildOrderHash(t *testing.T) {
assert.NoError(t, err)
assert.NotNil(t, order)

orderHash, err := builder.BuildOrderHash(order, model.Exchange)
orderHash, err := builder.BuildOrderHash(order, model.CTFExchange)
assert.NoError(t, err)
assert.NotNil(t, orderHash)

Expand All @@ -119,7 +119,7 @@ func TestBuildOrderHash(t *testing.T) {
assert.NoError(t, err)
assert.NotNil(t, order)

orderHash, err = builder.BuildOrderHash(order, model.Exchange)
orderHash, err = builder.BuildOrderHash(order, model.CTFExchange)
assert.NoError(t, err)
assert.NotNil(t, orderHash)

Expand All @@ -143,7 +143,7 @@ func TestBuildOrderHash(t *testing.T) {
assert.NoError(t, err)
assert.NotNil(t, order)

orderHash, err = builder.BuildOrderHash(order, model.NegRiskExchange)
orderHash, err = builder.BuildOrderHash(order, model.NegRiskCTFExchange)
assert.NoError(t, err)
assert.NotNil(t, orderHash)

Expand All @@ -163,7 +163,7 @@ func TestBuildOrderHash(t *testing.T) {
assert.NoError(t, err)
assert.NotNil(t, order)

orderHash, err = builder.BuildOrderHash(order, model.NegRiskExchange)
orderHash, err = builder.BuildOrderHash(order, model.NegRiskCTFExchange)
assert.NoError(t, err)
assert.NotNil(t, orderHash)

Expand All @@ -189,7 +189,7 @@ func TestBuildOrderSignature(t *testing.T) {
assert.NoError(t, err)
assert.NotNil(t, order)

orderHash, err := builder.BuildOrderHash(order, model.Exchange)
orderHash, err := builder.BuildOrderHash(order, model.CTFExchange)
assert.NoError(t, err)
assert.NotNil(t, orderHash)

Expand All @@ -213,7 +213,7 @@ func TestBuildOrderSignature(t *testing.T) {
assert.NoError(t, err)
assert.NotNil(t, order)

orderHash, err = builder.BuildOrderHash(order, model.Exchange)
orderHash, err = builder.BuildOrderHash(order, model.CTFExchange)
assert.NoError(t, err)
assert.NotNil(t, orderHash)

Expand Down Expand Up @@ -241,7 +241,7 @@ func TestBuildOrderSignature(t *testing.T) {
assert.NoError(t, err)
assert.NotNil(t, order)

orderHash, err = builder.BuildOrderHash(order, model.NegRiskExchange)
orderHash, err = builder.BuildOrderHash(order, model.NegRiskCTFExchange)
assert.NoError(t, err)
assert.NotNil(t, orderHash)

Expand All @@ -265,7 +265,7 @@ func TestBuildOrderSignature(t *testing.T) {
assert.NoError(t, err)
assert.NotNil(t, order)

orderHash, err = builder.BuildOrderHash(order, model.NegRiskExchange)
orderHash, err = builder.BuildOrderHash(order, model.NegRiskCTFExchange)
assert.NoError(t, err)
assert.NotNil(t, orderHash)

Expand All @@ -291,7 +291,7 @@ func TestBuildSignedOrder(t *testing.T) {
Side: model.BUY,
FeeRateBps: "100",
Nonce: "0",
}, model.Exchange)
}, model.CTFExchange)
assert.NoError(t, err)
assert.NotNil(t, signedOrder)

Expand Down Expand Up @@ -321,7 +321,7 @@ func TestBuildSignedOrder(t *testing.T) {
Side: model.BUY,
FeeRateBps: "100",
Nonce: "0",
}, model.Exchange)
}, model.CTFExchange)
assert.NoError(t, err)
assert.NotNil(t, signedOrder)

Expand Down Expand Up @@ -354,7 +354,7 @@ func TestBuildSignedOrder(t *testing.T) {
Side: model.BUY,
FeeRateBps: "100",
Nonce: "0",
}, model.NegRiskExchange)
}, model.NegRiskCTFExchange)
assert.NoError(t, err)
assert.NotNil(t, signedOrder)

Expand Down Expand Up @@ -384,7 +384,7 @@ func TestBuildSignedOrder(t *testing.T) {
Side: model.BUY,
FeeRateBps: "100",
Nonce: "0",
}, model.NegRiskExchange)
}, model.NegRiskCTFExchange)
assert.NoError(t, err)
assert.NotNil(t, signedOrder)

Expand Down
4 changes: 2 additions & 2 deletions pkg/model/module.go
Expand Up @@ -3,6 +3,6 @@ package model
type VerifyingContract = int

const (
Exchange VerifyingContract = iota
NegRiskExchange
CTFExchange VerifyingContract = iota
NegRiskCTFExchange
)
4 changes: 2 additions & 2 deletions pkg/utils/module.go
Expand Up @@ -16,9 +16,9 @@ func GetVerifyingContractAddress(chainId *big.Int, contract model.VerifyingContr
}

switch contract {
case model.Exchange:
case model.CTFExchange:
return contracts.Exchange, nil
case model.NegRiskExchange:
case model.NegRiskCTFExchange:
return contracts.NegRiskExchange, nil
}

Expand Down
12 changes: 6 additions & 6 deletions pkg/utils/module_test.go
Expand Up @@ -11,27 +11,27 @@ import (

func TestGetVerifyingContractAddress(t *testing.T) {
// mumbai
contract, err := GetVerifyingContractAddress(big.NewInt(80001), model.Exchange)
contract, err := GetVerifyingContractAddress(big.NewInt(80001), model.CTFExchange)
assert.NoError(t, err)
assert.Equal(t, common.HexToAddress("0x4bFb41d5B3570DeFd03C39a9A4D8dE6Bd8B8982E").Hex(), contract.Hex())

contract, err = GetVerifyingContractAddress(big.NewInt(80001), model.NegRiskExchange)
contract, err = GetVerifyingContractAddress(big.NewInt(80001), model.NegRiskCTFExchange)
assert.NoError(t, err)
assert.Equal(t, common.HexToAddress("0xC5d563A36AE78145C45a50134d48A1215220f80a").Hex(), contract.Hex())

// polygon mainnet
contract, err = GetVerifyingContractAddress(big.NewInt(137), model.Exchange)
contract, err = GetVerifyingContractAddress(big.NewInt(137), model.CTFExchange)
assert.NoError(t, err)
assert.Equal(t, common.HexToAddress("0x4bFb41d5B3570DeFd03C39a9A4D8dE6Bd8B8982E").Hex(), contract.Hex())

contract, err = GetVerifyingContractAddress(big.NewInt(137), model.NegRiskExchange)
contract, err = GetVerifyingContractAddress(big.NewInt(137), model.NegRiskCTFExchange)
assert.NoError(t, err)
assert.Equal(t, common.HexToAddress("0xC5d563A36AE78145C45a50134d48A1215220f80a").Hex(), contract.Hex())

// wrong network
_, err = GetVerifyingContractAddress(big.NewInt(1), model.Exchange)
_, err = GetVerifyingContractAddress(big.NewInt(1), model.CTFExchange)
assert.Error(t, err)

_, err = GetVerifyingContractAddress(big.NewInt(1), model.NegRiskExchange)
_, err = GetVerifyingContractAddress(big.NewInt(1), model.NegRiskCTFExchange)
assert.Error(t, err)
}

0 comments on commit 777932c

Please sign in to comment.