pini/duniter-gva
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

deps: update duniter-core

Browse source
This commit is contained in:
librelois 2021-05-15 18:24:59 +02:00
parent f5d8f70bce
commit f8c5e0a0af
4 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Cargo.lock generated
View file

@ -772,7 +772,7 @@ dependencies = [
[[package]] [[package]]
name = "duniter-bc-reader" name = "duniter-bc-reader"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.duniter.org/nodes/rust/duniter-core#116bdbe459f3eaabd14fe0611527379689385d6f" source = "git+https://git.duniter.org/nodes/rust/duniter-core#4ce40a98dbc3cb3241e6d91817a8753a9be95ee8"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"dubp", "dubp",
@ -818,7 +818,7 @@ dependencies = [
[[package]] [[package]]
name = "duniter-conf" name = "duniter-conf"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.duniter.org/nodes/rust/duniter-core#116bdbe459f3eaabd14fe0611527379689385d6f" source = "git+https://git.duniter.org/nodes/rust/duniter-core#4ce40a98dbc3cb3241e6d91817a8753a9be95ee8"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"dubp", "dubp",
@ -832,7 +832,7 @@ dependencies = [
[[package]] [[package]]
name = "duniter-core" name = "duniter-core"
version = "1.8.1" version = "1.8.1"
source = "git+https://git.duniter.org/nodes/rust/duniter-core#116bdbe459f3eaabd14fe0611527379689385d6f" source = "git+https://git.duniter.org/nodes/rust/duniter-core#4ce40a98dbc3cb3241e6d91817a8753a9be95ee8"
dependencies = [ dependencies = [
"duniter-bc-reader", "duniter-bc-reader",
"duniter-conf", "duniter-conf",
@ -845,7 +845,7 @@ dependencies = [
[[package]] [[package]]
name = "duniter-dbs" name = "duniter-dbs"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.duniter.org/nodes/rust/duniter-core#116bdbe459f3eaabd14fe0611527379689385d6f" source = "git+https://git.duniter.org/nodes/rust/duniter-core#4ce40a98dbc3cb3241e6d91817a8753a9be95ee8"
dependencies = [ dependencies = [
"arrayvec 0.7.0", "arrayvec 0.7.0",
"bincode", "bincode",
@ -868,7 +868,7 @@ dependencies = [
[[package]] [[package]]
name = "duniter-dbs-write-ops" name = "duniter-dbs-write-ops"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.duniter.org/nodes/rust/duniter-core#116bdbe459f3eaabd14fe0611527379689385d6f" source = "git+https://git.duniter.org/nodes/rust/duniter-core#4ce40a98dbc3cb3241e6d91817a8753a9be95ee8"
dependencies = [ dependencies = [
"chrono", "chrono",
"dubp", "dubp",
@ -883,7 +883,7 @@ dependencies = [
[[package]] [[package]]
name = "duniter-global" name = "duniter-global"
version = "1.8.1" version = "1.8.1"
source = "git+https://git.duniter.org/nodes/rust/duniter-core#116bdbe459f3eaabd14fe0611527379689385d6f" source = "git+https://git.duniter.org/nodes/rust/duniter-core#4ce40a98dbc3cb3241e6d91817a8753a9be95ee8"
dependencies = [ dependencies = [
"async-rwlock", "async-rwlock",
"dubp", "dubp",
@ -1018,7 +1018,7 @@ dependencies = [
[[package]] [[package]]
name = "duniter-mempools" name = "duniter-mempools"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.duniter.org/nodes/rust/duniter-core#116bdbe459f3eaabd14fe0611527379689385d6f" source = "git+https://git.duniter.org/nodes/rust/duniter-core#4ce40a98dbc3cb3241e6d91817a8753a9be95ee8"
dependencies = [ dependencies = [
"dubp", "dubp",
"duniter-bc-reader", "duniter-bc-reader",
@ -1031,7 +1031,7 @@ dependencies = [
[[package]] [[package]]
name = "duniter-module" name = "duniter-module"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.duniter.org/nodes/rust/duniter-core#116bdbe459f3eaabd14fe0611527379689385d6f" source = "git+https://git.duniter.org/nodes/rust/duniter-core#4ce40a98dbc3cb3241e6d91817a8753a9be95ee8"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-mutex", "async-mutex",
@ -1602,7 +1602,7 @@ dependencies = [
[[package]] [[package]]
name = "kv_typed" name = "kv_typed"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.duniter.org/nodes/rust/duniter-core#116bdbe459f3eaabd14fe0611527379689385d6f" source = "git+https://git.duniter.org/nodes/rust/duniter-core#4ce40a98dbc3cb3241e6d91817a8753a9be95ee8"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"cfg-if 0.1.10", "cfg-if 0.1.10",

24
db/src/lib.rs
View file

@ -51,29 +51,29 @@ pub(crate) use std::collections::BTreeSet;
db_schema!( db_schema!(
GvaV1, GvaV1,
[ [
["balances", Balances, WalletConditionsV2, SourceAmountValV2],
["blocks_by_common_time", BlocksByCommonTime, U64BE, u32], ["blocks_by_common_time", BlocksByCommonTime, U64BE, u32],
["blocks_with_ud", BlocksWithUd, U32BE, ()], ["blocks_with_ud", BlocksWithUd, U32BE, ()],
["blockchain_time", BlockchainTime, U32BE, u64], ["blockchain_time", BlockchainTime, U32BE, u64],
["blocks_chunk_hash", BlocksChunkHash, U32BE, HashDb], ["blocks_chunk_hash", BlocksChunkHash, U32BE, HashDb],
["compressed_blocks_chunk", CompressedBlocksChunk, U32BE, Vec<u8>], ["compressed_blocks_chunk", CompressedBlocksChunk, U32BE, Vec<u8>],
["current_blocks_chunk", CurrentBlocksChunk, U32BE, GvaBlockDbV1], ["current_blocks_chunk", CurrentBlocksChunk, U32BE, GvaBlockDbV1],
["txs", Txs, HashKeyV2, GvaTxDbV1], ["gva_identities", GvaIdentities, PubKeyKeyV2, GvaIdtyDbV1],
["txs_by_block", TxsByBlock, U32BE, Vec<Hash>],
["txs_by_issuer", TxsByIssuer, WalletHashWithBnV1Db, BTreeSet<Hash>],
["txs_by_recipient", TxsByRecipient, WalletHashWithBnV1Db, BTreeSet<Hash>],
[
"scripts_by_pubkey",
ScriptsByPubkey,
PubKeyKeyV2,
WalletScriptArrayV2
],
[ [
"gva_utxos", "gva_utxos",
GvaUtxos, GvaUtxos,
GvaUtxoIdDbV1, GvaUtxoIdDbV1,
SourceAmountValV2 SourceAmountValV2
], ],
["balances", Balances, WalletConditionsV2, SourceAmountValV2], [
["gva_identities", GvaIdentities, PubKeyKeyV2, GvaIdtyDbV1], "scripts_by_pubkey",
ScriptsByPubkey,
PubKeyKeyV2,
WalletScriptArrayV2
],
["txs", Txs, HashKeyV2, GvaTxDbV1],
["txs_by_block", TxsByBlock, U32BE, Vec<Hash>],
["txs_by_issuer", TxsByIssuer, WalletHashWithBnV1Db, BTreeSet<Hash>],
["txs_by_recipient", TxsByRecipient, WalletHashWithBnV1Db, BTreeSet<Hash>],
] ]
); );

6
dbs-reader/src/idty.rs
View file

@ -31,6 +31,8 @@ impl DbsReaderImpl {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use dubp::common::prelude::Blockstamp;
use dubp::crypto::keys::ed25519::Signature;
use duniter_core::dbs::databases::bc_v2::BcV2DbWritable; use duniter_core::dbs::databases::bc_v2::BcV2DbWritable;
#[test] #[test]
@ -52,7 +54,9 @@ mod tests {
bc_db.identities_write().upsert( bc_db.identities_write().upsert(
PubKeyKeyV2(pk), PubKeyKeyV2(pk),
duniter_core::dbs::IdtyDbV2 { duniter_core::dbs::IdtyDbV2 {
created_on: Blockstamp::default(),
is_member: true, is_member: true,
signature: Signature::default(),
username: String::from("JohnDoe"), username: String::from("JohnDoe"),
}, },
)?; )?;
@ -60,7 +64,9 @@ mod tests {
assert_eq!( assert_eq!(
db_reader.idty(&bc_db_ro, pk)?, db_reader.idty(&bc_db_ro, pk)?,
Some(duniter_core::dbs::IdtyDbV2 { Some(duniter_core::dbs::IdtyDbV2 {
created_on: Blockstamp::default(),
is_member: true, is_member: true,
signature: Signature::default(),
username: String::from("JohnDoe"), username: String::from("JohnDoe"),
}) })
); );

1
gql/src/queries/idty.rs
View file

@ -58,6 +58,7 @@ mod tests {
Ok(Some(duniter_core::dbs::IdtyDbV2 { Ok(Some(duniter_core::dbs::IdtyDbV2 {
is_member: true, is_member: true,
username: String::from("JohnDoe"), username: String::from("JohnDoe"),
..Default::default()
})) }))
}); });
let schema = create_schema(MockAsyncAccessor::new(), dbs_reader)?; let schema = create_schema(MockAsyncAccessor::new(), dbs_reader)?;