Skip to content

Commit 5bd6137

Browse files
author
Ed Gamble
authored
Merge pull request #381 from breadwallet/feature/CORE-757
CORE-757: In test sources, use explicit header paths.
2 parents d082070 + 68714d0 commit 5bd6137

File tree

13 files changed

+50
-48
lines changed

13 files changed

+50
-48
lines changed

‎bitcoin/test.c‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,31 @@
2323
// THE SOFTWARE.
2424

2525
#include "support/BRCrypto.h"
26-
#include "BRBloomFilter.h"
27-
#include "BRMerkleBlock.h"
28-
#include "BRWallet.h"
29-
#include "BRKey.h"
30-
#include "BRBIP38Key.h"
31-
#include "BRKeyECIES.h"
32-
#include "BRAddress.h"
33-
#include "BRBase58.h"
34-
#include "BRBech32.h"
35-
#include "BRBIP39Mnemonic.h"
36-
#include "BRBIP39WordsEn.h"
37-
#include "BRPeer.h"
38-
#include "BRPeerManager.h"
39-
#include "BRChainParams.h"
26+
#include "support/BRInt.h"
27+
#include "support/BRArray.h"
28+
#include "support/BRSet.h"
29+
#include "support/BRKey.h"
30+
#include "support/BRKeyECIES.h"
31+
#include "support/BRAddress.h"
32+
#include "support/BRBase58.h"
33+
#include "support/BRBech32.h"
34+
#include "support/BRBIP39Mnemonic.h"
35+
#include "support/BRBIP39WordsEn.h"
36+
4037
#include "bcash/BRBCashParams.h"
4138
#include "bcash/BRBCashAddr.h"
42-
#include "BRPaymentProtocol.h"
43-
#include "BRInt.h"
44-
#include "BRArray.h"
45-
#include "BRSet.h"
46-
#include "BRTransaction.h"
47-
#include "BRWalletManager.h"
39+
40+
#include "bitcoin/BRBloomFilter.h"
41+
#include "bitcoin/BRMerkleBlock.h"
42+
#include "bitcoin/BRWallet.h"
43+
#include "bitcoin/BRBIP38Key.h"
44+
#include "bitcoin/BRPeer.h"
45+
#include "bitcoin/BRPeerManager.h"
46+
#include "bitcoin/BRChainParams.h"
47+
#include "bitcoin/BRPaymentProtocol.h"
48+
#include "bitcoin/BRTransaction.h"
49+
#include "bitcoin/BRWalletManager.h"
50+
4851
#include <stdio.h>
4952
#include <stdlib.h>
5053
#include <string.h>

‎bitcoin/testBwm.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
#include "bcash/BRBCashParams.h"
1818
#include "bitcoin/BRChainParams.h"
1919

20-
#include "BRArray.h"
21-
#include "BRBIP39Mnemonic.h"
22-
#include "BRPeerManager.h"
23-
#include "BRTransaction.h"
24-
#include "BRWallet.h"
25-
#include "BRWalletManager.h"
20+
#include "support/BRArray.h"
21+
#include "support/BRBIP39Mnemonic.h"
22+
#include "bitcoin/BRPeerManager.h"
23+
#include "bitcoin/BRTransaction.h"
24+
#include "bitcoin/BRWallet.h"
25+
#include "bitcoin/BRWalletManager.h"
2626

2727
#ifdef __ANDROID__
2828
#include <android/log.h>

‎ethereum/base/testBase.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <stdio.h>
1212
#include <assert.h>
1313
#include "support/BRCrypto.h"
14-
#include "BREthereumBase.h"
14+
#include "ethereum/base/BREthereumBase.h"
1515

1616
static void
1717
runEtherParseTests () {

‎ethereum/blockchain/testBc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <stdio.h>
1212
#include <string.h>
1313
#include <assert.h>
14-
#include "BREthereumBlockChain.h"
14+
#include "ethereum/blockchain/BREthereumBlockChain.h"
1515

1616
//
1717
// Bloom Test

‎ethereum/contract/testContract.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include <stdio.h>
1212
#include <assert.h>
1313

14-
#include "BREthereumContract.h"
15-
#include "BREthereumToken.h"
14+
#include "ethereum/contract/BREthereumContract.h"
15+
#include "ethereum/contract/BREthereumToken.h"
1616

1717
#if defined (BITCOIN_TESTNET)
1818
const char *tokenBRDAddress = "0x7108ca7c4718efa810457f228305c9c71390931a"; // testnet

‎ethereum/event/testEvent.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include <stdio.h>
1212
#include <assert.h>
1313
#include <pthread.h>
14-
#include "BREvent.h"
15-
#include "BREventAlarm.h"
14+
#include "ethereum/event/BREvent.h"
15+
#include "ethereum/event/BREventAlarm.h"
1616

1717
static pthread_cond_t testEventAlarmConditional = PTHREAD_COND_INITIALIZER;
1818
static pthread_mutex_t testEventAlarmMutex = PTHREAD_MUTEX_INITIALIZER;

‎ethereum/ewm/testEwm.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <assert.h>
1414
#include <unistd.h>
1515
#include "ethereum/event/BREventAlarm.h"
16-
#include "BREthereumEWMPrivate.h"
16+
#include "ethereum/ewm/BREthereumEWMPrivate.h"
1717

1818
//
1919
// EWM Tests

‎ethereum/les/testLES.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
#include "support/BRCrypto.h"
2929
#include "ethereum/base/BREthereumHash.h"
3030
#include "ethereum/blockchain/BREthereumNetwork.h"
31-
#include "BREthereumLESRandom.h"
32-
#include "BREthereumLES.h"
33-
#include "BREthereumNode.h"
31+
#include "ethereum/les/BREthereumLESRandom.h"
32+
#include "ethereum/les/BREthereumLES.h"
33+
#include "ethereum/les/BREthereumNode.h"
3434

3535
#include "ethereum/BREthereum.h"
3636

‎ethereum/rlp/testRlp.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <assert.h>
1414
#include <string.h>
1515
#include "ethereum/util/BRUtil.h"
16-
#include "BRRlp.h"
16+
#include "ethereum/rlp/BRRlp.h"
1717

1818
static void
1919
showHex (uint8_t *source, size_t sourceLen) {

‎ethereum/test.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
#include "ethereum/ewm/BREthereumAccount.h"
3030
#include "ethereum/ewm/BREthereumWallet.h"
3131
#include "ethereum/ewm/BREthereumTransfer.h"
32-
#include "BREthereum.h"
32+
#include "ethereum/BREthereum.h"
3333

34-
#include "test.h"
34+
#include "ethereum/test.h"
3535

3636
extern const char *tokenBRDAddress;
3737

0 commit comments

Comments
 (0)