Skip to content

Commit

Permalink
renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
@poly-rodr
poly-rodr committed Nov 21, 2023
1 parent 2016ae5 commit 65555a6
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 44 deletions.
4 changes: 2 additions & 2 deletions pkg/builder/exchange_order_builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type ExchangeOrderBuilder interface {
// @param orderData
//
// @returns a SignedOrder object (order + signature)
BuildSignedOrder(privateKey *ecdsa.PrivateKey, orderData *model.OrderData, module model.CTFModule) (*model.SignedOrder, error)
BuildSignedOrder(privateKey *ecdsa.PrivateKey, orderData *model.OrderData, contract model.VerifyingContract) (*model.SignedOrder, error)

// Creates an Order object from order data.
//
Expand All @@ -29,7 +29,7 @@ type ExchangeOrderBuilder interface {
// @param Order
//
// @returns a OrderHash that is a 'common.Hash'
BuildOrderHash(order *model.Order, module model.CTFModule) (model.OrderHash, error)
BuildOrderHash(order *model.Order, contract model.VerifyingContract) (model.OrderHash, error)

// signs an order
//
Expand Down
8 changes: 4 additions & 4 deletions pkg/builder/exchange_order_builder_impl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ func NewExchangeOrderBuilderImpl(chainId *big.Int, saltGenerator func() int64) *
// @param orderData
//
// @returns a SignedOrder object (order + signature)
func (e *ExchangeOrderBuilderImpl) BuildSignedOrder(privateKey *ecdsa.PrivateKey, orderData *model.OrderData, module model.CTFModule) (*model.SignedOrder, error) {
func (e *ExchangeOrderBuilderImpl) BuildSignedOrder(privateKey *ecdsa.PrivateKey, orderData *model.OrderData, contract model.VerifyingContract) (*model.SignedOrder, error) {
order, err := e.BuildOrder(orderData)
if err != nil {
return nil, err
}

orderHash, err := e.BuildOrderHash(order, module)
orderHash, err := e.BuildOrderHash(order, contract)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -134,8 +134,8 @@ func (e *ExchangeOrderBuilderImpl) BuildOrder(orderData *model.OrderData) (*mode
// @param Order
//
// @returns a OrderHash that is a 'common.Hash'
func (e *ExchangeOrderBuilderImpl) BuildOrderHash(order *model.Order, module model.CTFModule) (model.OrderHash, error) {
verifyingContract, err := utils.GetVerifyingContractAddress(e.chainId, module)
func (e *ExchangeOrderBuilderImpl) BuildOrderHash(order *model.Order, contract model.VerifyingContract) (model.OrderHash, error) {
verifyingContract, err := utils.GetVerifyingContractAddress(e.chainId, contract)
if err != nil {
return model.OrderHash{}, err
}
Expand Down
24 changes: 12 additions & 12 deletions pkg/builder/exchange_order_builder_impl_test.go
View file
Original file line number Diff line number Diff line change
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.FeeModule)
orderHash, err := builder.BuildOrderHash(order, model.Exchange)
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.FeeModule)
orderHash, err = builder.BuildOrderHash(order, model.Exchange)
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.NegRiskModule)
orderHash, err = builder.BuildOrderHash(order, model.NegRiskExchange)
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.NegRiskModule)
orderHash, err = builder.BuildOrderHash(order, model.NegRiskExchange)
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.FeeModule)
orderHash, err := builder.BuildOrderHash(order, model.Exchange)
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.FeeModule)
orderHash, err = builder.BuildOrderHash(order, model.Exchange)
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.NegRiskModule)
orderHash, err = builder.BuildOrderHash(order, model.NegRiskExchange)
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.NegRiskModule)
orderHash, err = builder.BuildOrderHash(order, model.NegRiskExchange)
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.FeeModule)
}, model.Exchange)
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.FeeModule)
}, model.Exchange)
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.NegRiskModule)
}, model.NegRiskExchange)
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.NegRiskModule)
}, model.NegRiskExchange)
assert.NoError(t, err)
assert.NotNil(t, signedOrder)

Expand Down
24 changes: 12 additions & 12 deletions pkg/builder/mocks/ExchangeOrderBuilder.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkg/model/module.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package model

type CTFModule = int
type VerifyingContract = int

const (
FeeModule CTFModule = iota
NegRiskModule
Exchange VerifyingContract = iota
NegRiskExchange
)
10 changes: 5 additions & 5 deletions pkg/utils/module.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ import (
"github.com/polymarket/go-order-utils/pkg/model"
)

func GetVerifyingContractAddress(chainId *big.Int, module model.CTFModule) (common.Address, error) {
func GetVerifyingContractAddress(chainId *big.Int, contract model.VerifyingContract) (common.Address, error) {
contracts, err := config.GetContracts(chainId.Int64())
if err != nil {
return common.Address{}, err
}

switch module {
case model.FeeModule:
switch contract {
case model.Exchange:
return contracts.Exchange, nil
case model.NegRiskModule:
case model.NegRiskExchange:
return contracts.NegRiskExchange, nil
}

return common.Address{}, fmt.Errorf("invalid module")
return common.Address{}, fmt.Errorf("invalid contract")
}
12 changes: 6 additions & 6 deletions pkg/utils/module_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,27 @@ import (

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

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

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

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

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

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

0 comments on commit 65555a6

Please sign in to comment.