Skip to content

Unit all docker client config to same private.key #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xq262144 merged 2 commits into from
Feb 2, 2019
Merged

Unit all docker client config to same private.key #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a68dedc
Format all client role config in test/service
laodouya Feb 1, 2019
da7197e
Change adapter/mysql_adapter/observer private.key same with node_c. G…
laodouya Feb 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 11 additions & 23 deletions test/service/node_adapter/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ WorkingRoot: "./"
PubKeyStoreFile: "public.keystore"
PrivateKeyFile: "private.key"
DHTFileName: "dht.db"
ListenAddr: "172.254.1.4:4661"
ThisNodeID: "00000f3b43288fe99831eb533ab77ec455d13e11fc38ec35a42d4edd17aa320d"
ListenAddr: "172.254.1.11:4661"
ThisNodeID: "000000a84cbab048a6b8668038ef78fc2370dc5ea89cbb0509a4ebd011320ce7"
QPS: 1000
ChainBusPeriod: 20s
BillingBlockCount: 60
BPPeriod: 3s
BPTick: 1s
SQLChainPeriod: 3s
Expand Down Expand Up @@ -36,26 +35,6 @@ BlockProducer:
c: 0
d: 0
ChainFileName: "chain.db"
BPGenesisInfo:
Version: 1
BlockHash: f745ca6427237aac858dd3c7f2df8e6f3c18d0f1c164e07a1c6b8eebeba6b154
Producer: 0000000000000000000000000000000000000000000000000000000000000001
MerkleRoot: 0000000000000000000000000000000000000000000000000000000000000001
ParentHash: 0000000000000000000000000000000000000000000000000000000000000001
Timestamp: "2019-01-10T12:49:07+08:00"
BaseAccounts:
- Address: ba0ba731c7a76ccef2c1170f42038f7e228dfb474ef0190dfe35d9a37911ed37
StableCoinBalance: 10000000000000000000
CovenantCoinBalance: 10000000000000000000
- Address: 1a7b0959bbd0d0ec529278a61c0056c277bffe75b2646e1699b46b10a90210be
StableCoinBalance: 10000000000000000000
CovenantCoinBalance: 10000000000000000000
- Address: 9235bc4130a2ed4e6c35ea189dab35198ebb105640bedb97dd5269cc80863b16
StableCoinBalance: 10000000000000000000
CovenantCoinBalance: 10000000000000000000
- Address: 9e1618775cceeb19f110e04fbc6c5bca6c8e4e9b116e193a42fe69bf602e7bcd
StableCoinBalance: 10000000000000000000
CovenantCoinBalance: 10000000000000000000
KnownNodes:
- ID: 00000bef611d346c0cbe1beaa76e7f0ed705a194fdf9ac3a248ec70e9c198bf9
Nonce:
Expand Down Expand Up @@ -120,6 +99,15 @@ KnownNodes:
Addr: 172.254.1.7:4661
PublicKey: 03ae859eac5b72ee428c7a85f10b2ce748d9de5e480aefbb70f6597dfa8b2175e5
Role: Miner
- ID: 000000a84cbab048a6b8668038ef78fc2370dc5ea89cbb0509a4ebd011320ce7
Nonce:
a: 10414418
b: 0
c: 0
d: 1802504485
Addr: 172.254.1.11:4661
PublicKey: 02ec784ca599f21ef93fe7abdc68d78817ab6c9b31f2324d15ea174d9da498b4c4
Role: Client
Adapter:
ListenAddr: 0.0.0.0:4661
CertificatePath: ./server.test.covenantsql.io.pem
Expand Down
20 changes: 1 addition & 19 deletions test/service/node_c/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ ListenAddr: "127.0.0.1:4661"
ThisNodeID: "00000f3b43288fe99831eb533ab77ec455d13e11fc38ec35a42d4edd17aa320d"
QPS: 1000
ChainBusPeriod: 20s
BillingBlockCount: 3600
BPPeriod: 3s
BPTick: 1s
SQLChainPeriod: 3s
Expand Down Expand Up @@ -36,13 +35,6 @@ BlockProducer:
c: 0
d: 0
ChainFileName: "chain.db"
BPGenesisInfo:
Version: 1
BlockHash: f745ca6427237aac858dd3c7f2df8e6f3c18d0f1c164e07a1c6b8eebeba6b154
Producer: 0000000000000000000000000000000000000000000000000000000000000001
MerkleRoot: 0000000000000000000000000000000000000000000000000000000000000001
ParentHash: 0000000000000000000000000000000000000000000000000000000000000001
Timestamp: "2019-01-10T12:49:07+08:00"
KnownNodes:
- ID: 00000bef611d346c0cbe1beaa76e7f0ed705a194fdf9ac3a248ec70e9c198bf9
Nonce:
Expand Down Expand Up @@ -107,14 +99,4 @@ KnownNodes:
Addr: 127.0.0.1:11104 #172.254.1.7:4661
PublicKey: 03ae859eac5b72ee428c7a85f10b2ce748d9de5e480aefbb70f6597dfa8b2175e5
Role: Miner
Adapter:
ListenAddr: 0.0.0.0:4661
CertificatePath: ./server.test.covenantsql.io.pem
PrivateKeyPath: ./server.test.covenantsql.io-key.pem
VerifyCertificate: true
ClientCAPath: ./rootCA.pem
AdminCerts:
- ./admin.test.covenantsql.io.pem
WriteCerts:
- ./write.test.covenantsql.io.pem
StorageDriver: covenantsql

169 changes: 79 additions & 90 deletions test/service/node_mysql_adapter/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ WorkingRoot: "./"
PubKeyStoreFile: "public.keystore"
PrivateKeyFile: "private.key"
DHTFileName: "dht.db"
ListenAddr: "172.254.1.4:4661"
ThisNodeID: "00000f3b43288fe99831eb533ab77ec455d13e11fc38ec35a42d4edd17aa320d"
ListenAddr: "172.254.1.12:4661"
ThisNodeID: "00000072b13c696b8fa4ccf29595ba83c5baa92d980891691b41777481446cc7"
QPS: 1000
BillingBlockCount: 60
ChainBusPeriod: 20s
BPPeriod: 3s
BPTick: 1s
Expand All @@ -22,10 +21,10 @@ MinNodeIDDifficulty: 2
DNSSeed:
EnforcedDNSSEC: false
DNSServers:
- 1.1.1.1
- 202.46.34.74
- 202.46.34.75
- 202.46.34.76
- 1.1.1.1
- 202.46.34.74
- 202.46.34.75
- 202.46.34.76

BlockProducer:
PublicKey: "02c76216704d797c64c58bc11519fb68582e8e63de7e5b3b2dbbbe8733efe5fd24"
Expand All @@ -36,87 +35,77 @@ BlockProducer:
c: 0
d: 0
ChainFileName: "chain.db"
BPGenesisInfo:
Version: 1
BlockHash: f745ca6427237aac858dd3c7f2df8e6f3c18d0f1c164e07a1c6b8eebeba6b154
Producer: 0000000000000000000000000000000000000000000000000000000000000001
MerkleRoot: 0000000000000000000000000000000000000000000000000000000000000001
ParentHash: 0000000000000000000000000000000000000000000000000000000000000001
Timestamp: 2018-08-13T21:59:59.12Z
BaseAccounts:
- Address: ba0ba731c7a76ccef2c1170f42038f7e228dfb474ef0190dfe35d9a37911ed37
StableCoinBalance: 10000000000000000000
CovenantCoinBalance: 10000000000000000000
- Address: 1a7b0959bbd0d0ec529278a61c0056c277bffe75b2646e1699b46b10a90210be
StableCoinBalance: 10000000000000000000
CovenantCoinBalance: 10000000000000000000
- Address: 9235bc4130a2ed4e6c35ea189dab35198ebb105640bedb97dd5269cc80863b16
StableCoinBalance: 10000000000000000000
CovenantCoinBalance: 10000000000000000000
- Address: 9e1618775cceeb19f110e04fbc6c5bca6c8e4e9b116e193a42fe69bf602e7bcd
StableCoinBalance: 10000000000000000000
CovenantCoinBalance: 10000000000000000000
KnownNodes:
- ID: 00000bef611d346c0cbe1beaa76e7f0ed705a194fdf9ac3a248ec70e9c198bf9
Nonce:
a: 313283
b: 0
c: 0
d: 0
Addr: 172.254.1.2:4661
PublicKey: "02c76216704d797c64c58bc11519fb68582e8e63de7e5b3b2dbbbe8733efe5fd24"
Role: Leader
- ID: 00000381d46fd6cf7742d7fb94e2422033af989c0e348b5781b3219599a3af35
Nonce:
a: 478373
b: 0
c: 0
d: 2305843009893772025
Addr: 172.254.1.3:4661
PublicKey: "02c76216704d797c64c58bc11519fb68582e8e63de7e5b3b2dbbbe8733efe5fd24"
Role: Follower
- ID: 000000172580063ded88e010556b0aca2851265be8845b1ef397e8fce6ab5582
Nonce:
a: 259939
b: 0
c: 0
d: 2305843012544226372
Addr: 172.254.1.4:4661
PublicKey: "02c76216704d797c64c58bc11519fb68582e8e63de7e5b3b2dbbbe8733efe5fd24"
Role: Follower
- ID: 00000f3b43288fe99831eb533ab77ec455d13e11fc38ec35a42d4edd17aa320d
Nonce:
a: 22403
b: 0
c: 0
d: 0
Addr: ""
PublicKey: 02ec784ca599f21ef93fe7abdc68d78817ab6c9b31f2324d15ea174d9da498b4c4
Role: Client
- ID: 000005aa62048f85da4ae9698ed59c14ec0d48a88a07c15a32265634e7e64ade
Nonce:
a: 567323
b: 0
c: 0
d: 3104982049
Addr: 172.254.1.5:4661
PublicKey: 0367aa51809a7c1dc0f82c02452fec9557b3e1d10ce7c919d8e73d90048df86d20
Role: Miner
- ID: 000005f4f22c06f76c43c4f48d5a7ec1309cc94030cbf9ebae814172884ac8b5
Nonce:
a: 240524
b: 0
c: 0
d: 2305843010430351476
Addr: 172.254.1.6:4661
PublicKey: 02914bca0806f040dd842207c44474ab41ecd29deee7f2d355789c5c78d448ca16
Role: Miner
- ID: 000003f49592f83d0473bddb70d543f1096b4ffed5e5f942a3117e256b7052b8
Nonce:
a: 606016
b: 0
c: 0
d: 13835058056920509601
Addr: 172.254.1.7:4661
PublicKey: 03ae859eac5b72ee428c7a85f10b2ce748d9de5e480aefbb70f6597dfa8b2175e5
Role: Miner
- ID: 00000bef611d346c0cbe1beaa76e7f0ed705a194fdf9ac3a248ec70e9c198bf9
Nonce:
a: 313283
b: 0
c: 0
d: 0
Addr: 172.254.1.2:4661
PublicKey: "02c76216704d797c64c58bc11519fb68582e8e63de7e5b3b2dbbbe8733efe5fd24"
Role: Leader
- ID: 00000381d46fd6cf7742d7fb94e2422033af989c0e348b5781b3219599a3af35
Nonce:
a: 478373
b: 0
c: 0
d: 2305843009893772025
Addr: 172.254.1.3:4661
PublicKey: "02c76216704d797c64c58bc11519fb68582e8e63de7e5b3b2dbbbe8733efe5fd24"
Role: Follower
- ID: 000000172580063ded88e010556b0aca2851265be8845b1ef397e8fce6ab5582
Nonce:
a: 259939
b: 0
c: 0
d: 2305843012544226372
Addr: 172.254.1.4:4661
PublicKey: "02c76216704d797c64c58bc11519fb68582e8e63de7e5b3b2dbbbe8733efe5fd24"
Role: Follower
- ID: 00000f3b43288fe99831eb533ab77ec455d13e11fc38ec35a42d4edd17aa320d
Nonce:
a: 22403
b: 0
c: 0
d: 0
Addr: ""
PublicKey: 02ec784ca599f21ef93fe7abdc68d78817ab6c9b31f2324d15ea174d9da498b4c4
Role: Client
- ID: 000005aa62048f85da4ae9698ed59c14ec0d48a88a07c15a32265634e7e64ade
Nonce:
a: 567323
b: 0
c: 0
d: 3104982049
Addr: 172.254.1.5:4661
PublicKey: 0367aa51809a7c1dc0f82c02452fec9557b3e1d10ce7c919d8e73d90048df86d20
Role: Miner
- ID: 000005f4f22c06f76c43c4f48d5a7ec1309cc94030cbf9ebae814172884ac8b5
Nonce:
a: 240524
b: 0
c: 0
d: 2305843010430351476
Addr: 172.254.1.6:4661
PublicKey: 02914bca0806f040dd842207c44474ab41ecd29deee7f2d355789c5c78d448ca16
Role: Miner
- ID: 000003f49592f83d0473bddb70d543f1096b4ffed5e5f942a3117e256b7052b8
Nonce:
a: 606016
b: 0
c: 0
d: 13835058056920509601
Addr: 172.254.1.7:4661
PublicKey: 03ae859eac5b72ee428c7a85f10b2ce748d9de5e480aefbb70f6597dfa8b2175e5
Role: Miner
- ID: 00000072b13c696b8fa4ccf29595ba83c5baa92d980891691b41777481446cc7
Nonce:
a: 2786544
b: 0
c: 0
d: 1344760644
Addr: 172.254.1.12:4661
PublicKey: 02ec784ca599f21ef93fe7abdc68d78817ab6c9b31f2324d15ea174d9da498b4c4
Role: Client

Loading