Skip to content

Commit e999059

Browse files
committed
Adjust some test details to pass mock states
1 parent b236658 commit e999059

14 files changed

+122
-875
lines changed

factory/ethKleverBridgeComponents.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,12 @@ func NewEthKleverBridgeComponents(args ArgsEthereumToKleverBridge) (*ethKleverBr
174174
return nil, err
175175
}
176176

177-
err = components.createEthereumToMultiversXBridge(args)
177+
err = components.createEthereumToKleverBlockchainBridge(args)
178178
if err != nil {
179179
return nil, err
180180
}
181181

182-
err = components.createEthereumToMultiversXStateMachine()
182+
err = components.createEthereumToKleverBlockchainStateMachine()
183183
if err != nil {
184184
return nil, err
185185
}
@@ -484,7 +484,7 @@ func (components *ethKleverBridgeComponents) createEthereumRoleProvider(args Arg
484484
return nil
485485
}
486486

487-
func (components *ethKleverBridgeComponents) createEthereumToMultiversXBridge(args ArgsEthereumToKleverBridge) error {
487+
func (components *ethKleverBridgeComponents) createEthereumToKleverBlockchainBridge(args ArgsEthereumToKleverBridge) error {
488488
ethtokleverName := components.evmCompatibleChain.EvmCompatibleChainToKleverBlockchainName()
489489
log := core.NewLoggerWithIdentifier(logger.GetOrCreate(ethtokleverName), ethtokleverName)
490490

@@ -671,7 +671,7 @@ func (components *ethKleverBridgeComponents) createBalanceValidator() (ethklever
671671
return balanceValidatorManagement.NewBalanceValidator(argsBalanceValidator)
672672
}
673673

674-
func (components *ethKleverBridgeComponents) createEthereumToMultiversXStateMachine() error {
674+
func (components *ethKleverBridgeComponents) createEthereumToKleverBlockchainStateMachine() error {
675675
ethtokleverName := components.evmCompatibleChain.EvmCompatibleChainToKleverBlockchainName()
676676
log := core.NewLoggerWithIdentifier(logger.GetOrCreate(ethtokleverName), ethtokleverName)
677677

integrationTests/mock/KleverChainMock.go

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"math/big"
88
"sync"
99

10+
"github.com/ethereum/go-ethereum/common"
1011
factoryHasher "github.com/klever-io/klever-go/crypto/hashing/factory"
1112
"github.com/klever-io/klever-go/data/transaction"
1213
"github.com/klever-io/klever-go/tools"
@@ -151,3 +152,96 @@ func (mock *KleverBlockchainMock) SendTransactions(ctx context.Context, txs []*t
151152

152153
return hashes, nil
153154
}
155+
156+
// AddTokensPair -
157+
func (mock *KleverBlockchainMock) AddTokensPair(erc20 common.Address, ticker string, isNativeToken, isMintBurnToken bool, totalBalance, mintBalances, burnBalances *big.Int) {
158+
mock.mutState.Lock()
159+
defer mock.mutState.Unlock()
160+
161+
mock.addTokensPair(erc20, ticker, isNativeToken, isMintBurnToken, totalBalance, mintBalances, burnBalances)
162+
}
163+
164+
// SetLastExecutedEthBatchID -
165+
func (mock *KleverBlockchainMock) SetLastExecutedEthBatchID(lastExecutedEthBatchId uint64) {
166+
mock.mutState.Lock()
167+
defer mock.mutState.Unlock()
168+
169+
mock.lastExecutedEthBatchId = lastExecutedEthBatchId
170+
}
171+
172+
// SetLastExecutedEthTxId -
173+
func (mock *KleverBlockchainMock) SetLastExecutedEthTxId(lastExecutedEthTxId uint64) {
174+
mock.mutState.Lock()
175+
defer mock.mutState.Unlock()
176+
177+
mock.lastExecutedEthTxId = lastExecutedEthTxId
178+
}
179+
180+
// SetQuorum -
181+
func (mock *KleverBlockchainMock) SetQuorum(quorum int) {
182+
mock.mutState.Lock()
183+
defer mock.mutState.Unlock()
184+
185+
mock.quorum = quorum
186+
}
187+
188+
// AddRelayer -
189+
func (mock *KleverBlockchainMock) AddRelayer(address address.Address) {
190+
mock.mutState.Lock()
191+
defer mock.mutState.Unlock()
192+
193+
mock.relayers = append(mock.relayers, address.Bytes())
194+
}
195+
196+
// PerformedActionID returns the performed action ID
197+
func (mock *KleverBlockchainMock) PerformedActionID() *big.Int {
198+
mock.mutState.RLock()
199+
defer mock.mutState.RUnlock()
200+
201+
return mock.performedAction
202+
}
203+
204+
// ProposedTransfer returns the proposed transfer that matches the performed action ID
205+
func (mock *KleverBlockchainMock) ProposedTransfer() *kleverBlockchainProposedTransfer {
206+
mock.mutState.RLock()
207+
defer mock.mutState.RUnlock()
208+
209+
if mock.performedAction == nil {
210+
return nil
211+
}
212+
213+
for hash, transfer := range mock.proposedTransfers {
214+
if HashToActionID(hash).String() == mock.performedAction.String() {
215+
return transfer
216+
}
217+
}
218+
219+
return nil
220+
}
221+
222+
// SetPendingBatch -
223+
func (mock *KleverBlockchainMock) SetPendingBatch(pendingBatch *KleverBlockchainPendingBatch) {
224+
mock.mutState.Lock()
225+
mock.setPendingBatch(pendingBatch)
226+
mock.mutState.Unlock()
227+
}
228+
229+
// AddDepositToCurrentBatch -
230+
func (mock *KleverBlockchainMock) AddDepositToCurrentBatch(deposit KleverBlockchainDeposit) {
231+
mock.mutState.Lock()
232+
mock.pendingBatch.KleverBlockchainDeposits = append(mock.pendingBatch.KleverBlockchainDeposits, deposit)
233+
mock.mutState.Unlock()
234+
}
235+
236+
// GetAllSentTransactions -
237+
func (mock *KleverBlockchainMock) GetAllSentTransactions(_ context.Context) map[string]*transaction.Transaction {
238+
mock.mutState.RLock()
239+
defer mock.mutState.RUnlock()
240+
241+
txs := make(map[string]*transaction.Transaction)
242+
for hash, tx := range mock.sentTransactions {
243+
txs[hash] = tx
244+
}
245+
246+
return txs
247+
}

integrationTests/mock/KleverContractStateMock.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ func createOkVmResponse(args [][]byte) *models.VmValuesResponseData {
561561
return &models.VmValuesResponseData{
562562
Data: &vm.VMOutputApi{
563563
ReturnData: args,
564-
ReturnCode: "ok",
564+
ReturnCode: "Ok",
565565
},
566566
}
567567
}

integrationTests/mock/multiversXAccountsMock.go

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)