Skip to content

Commit

Permalink
Merge pull request #49 from pepecoinppc/resolve-test-failures
Browse files Browse the repository at this point in the history
Resolve test failures
  • Loading branch information
david2278 authored Jan 25, 2024
2 parents c64209d + 791bf09 commit 4f6165f
Show file tree
Hide file tree
Showing 9 changed files with 371 additions and 371 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Changes:

* Addresses start with `P` instead of `D`
* BIPS features will start block 1000
* AuxPow starts at block 1500 (Chain ID: 63)
* AuxPow starts at block 100,000 (Chain ID: 63)
* GUI themed for Pepecoin

## Usage 💻
Expand Down
2 changes: 1 addition & 1 deletion contrib/linearize/example-linearize.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ max_height=313000

# mainnet
netmagic=c0c0c0c0
genesis=0xb8fac7f8275af1072b983884fb128165862d7849d8f7d7841f282fb6f6c0b7a6
genesis=0x37981c0c48b8d48965376c8a42ece9a0838daadb93ff975cb091f57f8c2a5faa
input=/home/example/.pepecoin/blocks

# testnet
Expand Down
2 changes: 1 addition & 1 deletion contrib/linearize/linearize-data.py
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ def run(self):
if 'netmagic' not in settings:
settings['netmagic'] = 'c0c0c0c0'
if 'genesis' not in settings:
settings['genesis'] = 'b8fac7f8275af1072b983884fb128165862d7849d8f7d7841f282fb6f6c0b7a6'
settings['genesis'] = '37981c0c48b8d48965376c8a42ece9a0838daadb93ff975cb091f57f8c2a5faa'
if 'input' not in settings:
settings['input'] = 'input'
if 'hashlist' not in settings:
Expand Down
4 changes: 2 additions & 2 deletions doc/man/pepecoin-qt.1
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ block hash, %i is replaced by block number)
If this block is in the chain assume that it and its ancestors are valid
and potentially skip their script verification (0 to verify all,
default:
b8fac7f8275af1072b983884fb128165862d7849d8f7d7841f282fb6f6c0b7a6,
37981c0c48b8d48965376c8a42ece9a0838daadb93ff975cb091f57f8c2a5faa,
testnet:
1cd0b7925f5458a232a81eb10b5af2fccd202d6973d57fc0dd0ccf862cae09d2)
f9f4ea4ae7f6ea4c55040ede2019ba0a53e262f46ec9bce3dcda2cb11f96fc52)
.HP
\fB\-backupdir=\fR<dir>
.IP
Expand Down
4 changes: 2 additions & 2 deletions doc/man/pepecoind.1
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ block hash, %i is replaced by block number)
If this block is in the chain assume that it and its ancestors are valid
and potentially skip their script verification (0 to verify all,
default:
b8fac7f8275af1072b983884fb128165862d7849d8f7d7841f282fb6f6c0b7a6,
37981c0c48b8d48965376c8a42ece9a0838daadb93ff975cb091f57f8c2a5faa,
testnet:
1cd0b7925f5458a232a81eb10b5af2fccd202d6973d57fc0dd0ccf862cae09d2)
f9f4ea4ae7f6ea4c55040ede2019ba0a53e262f46ec9bce3dcda2cb11f96fc52)
.HP
\fB\-backupdir=\fR<dir>
.IP
Expand Down
720 changes: 360 additions & 360 deletions qa/rpc-tests/data/getblock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion qa/rpc-tests/getblock.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def run_test(self):

# Mainchain's genesis block shouldn't be found on regtest
assert_raises_jsonrpc(-5, 'Block not found', self.nodes[0].getblock,
blockhash='b8fac7f8275af1072b983884fb128165862d7849d8f7d7841f282fb6f6c0b7a6')
blockhash='37981c0c48b8d48965376c8a42ece9a0838daadb93ff975cb091f57f8c2a5faa')

# Invalid number of args
assert_raises_jsonrpc(-1, 'getblock "blockhash" ( verbosity )', self.nodes[0].getblock)
Expand Down
2 changes: 1 addition & 1 deletion src/qt/paymentrequest.proto
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ message Output {
required bytes script = 2; // usually one of the standard Script forms
}
message PaymentDetails {
optional string genesis = 1 [default = "0xb8fac7f8275af1072b983884fb128165862d7849d8f7d7841f282fb6f6c0b7a6"]; // Hash of the network genesis block
optional string genesis = 1 [default = "0x37981c0c48b8d48965376c8a42ece9a0838daadb93ff975cb091f57f8c2a5faa"]; // Hash of the network genesis block
repeated Output outputs = 2; // Where payment should be sent
required uint64 time = 3; // Timestamp; when payment request created
optional uint64 expires = 4; // Timestamp; when this request should be considered invalid
Expand Down
4 changes: 2 additions & 2 deletions src/qt/paymentserver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -240,11 +240,11 @@ void PaymentServer::ipcParseCommandLine(int argc, char* argv[])
PaymentRequestPlus request;
if (readPaymentRequestFromFile(arg, request))
{
if (request.getDetails().genesis() == "b8fac7f8275af1072b983884fb128165862d7849d8f7d7841f282fb6f6c0b7a6")
if (request.getDetails().genesis() == "37981c0c48b8d48965376c8a42ece9a0838daadb93ff975cb091f57f8c2a5faa")
{
SelectParams(CBaseChainParams::MAIN);
}
else if (request.getDetails().genesis() == "1cd0b7925f5458a232a81eb10b5af2fccd202d6973d57fc0dd0ccf862cae09d2")
else if (request.getDetails().genesis() == "f9f4ea4ae7f6ea4c55040ede2019ba0a53e262f46ec9bce3dcda2cb11f96fc52")
{
SelectParams(CBaseChainParams::TESTNET);
}
Expand Down

0 comments on commit 4f6165f

Please sign in to comment.